summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2016-09-10 11:13:57 +0200
committernicolargo <nicolashennion@gmail.com>2016-09-10 11:13:57 +0200
commit20576f8d08767f3340e73c681bcb30097397154a (patch)
tree76890ba9773cd848e5f89ae167734128c672a9fb /NEWS
parent744cd345852bbab4bc599ebc047ae6ebeff0f8a2 (diff)
version 2.7v2.7
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS8
1 files changed, 2 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index f33171dd..d60bac24 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,8 @@
Glances Version 2
==============================================================================
-Version 2.6.2
-=============
+Version 2.7
+===========
Backward-incompatible changes:
@@ -55,11 +55,7 @@ Version 2.6.2
Bugs corrected:
-<<<<<<< HEAD
* Crash with Docker 1.11 (issue #848)
-=======
- * Crash with Docker 1.11 (issue #848)
->>>>>>> master
Version 2.6.1
=============