diff options
| author | nicolargo <nicolas@nicolargo.com> | 2020-08-26 10:01:14 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2020-08-26 10:01:14 +0200 |
| commit | de7dff2b4e6290454df298c1b5858a6c98213f2f (patch) | |
| tree | 768c8e07eb18754c214a666640ee0d28081ad6d5 | |
| parent | e8031522601768a8bf687e88a9c844878a17941c (diff) | |
merge conflict in manpage? #1712
| -rw-r--r-- | docs/man/glances.1 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1 index e42a8e58..54bd3bbf 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,10 +1,6 @@ .\" Man page generated from reStructuredText. . -<<<<<<< HEAD .TH "GLANCES" "1" "Aug 19, 2020" "3.1.5" "Glances" -======= -.TH "GLANCES" "1" "Mar 25, 2020" "3.1.4.1" "Glances" ->>>>>>> master .SH NAME glances \- An eye on your system . |