diff options
| -rw-r--r-- | docs/man/glances.1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 1ae3fa51..1d400bb2 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,10 @@ .\" Man page generated from reStructuredText. . +<<<<<<< HEAD .TH "GLANCES" "1" "Jan 19, 2019" "3.1.0" "Glances" +======= +.TH "GLANCES" "1" "Sep 29, 2018" "3.0.2" "Glances" +>>>>>>> master .SH NAME glances \- An eye on your system . |