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 /docs | |
| parent | bae43e926a98209061ad354b58863a5379d179ca (diff) | |
| parent | 59788e91adce777a2ca0d3187411a88925c82ed6 (diff) | |
Resolve merge conflicts with master branch
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/man/glances.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1 index c48e269a..74171f51 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Sep 10, 2016" "2.7_" "Glances" +.TH "GLANCES" "1" "Sep 10, 2016" "2.7" "Glances" .SH NAME glances \- An eye on your system . |