diff options
| author | nicolargo <nicolashennion@gmail.com> | 2016-09-10 10:48:50 +0200 |
|---|---|---|
| committer | nicolargo <nicolashennion@gmail.com> | 2016-09-10 10:48:50 +0200 |
| commit | eaad5f5f3bbf468b2415d01fe55bcb54e3c16e27 (patch) | |
| tree | 966320793cfa503090e0cf7b661f5776196d53a5 /NEWS | |
| parent | bae43e926a98209061ad354b58863a5379d179ca (diff) | |
| parent | 59788e91adce777a2ca0d3187411a88925c82ed6 (diff) | |
Resolve merge conflicts with master branch
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2,8 +2,8 @@ Glances Version 2 ============================================================================== -Version 2.7 -=========== +Version 2.6.2 +============= Backward-incompatible changes: @@ -55,7 +55,11 @@ 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 ============= |