diff options
| author | nicolargo <nicolas@nicolargo.com> | 2020-08-26 10:01:14 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2020-08-26 10:01:47 +0200 |
| commit | dae111efcbb9414d74e14e0e01a0b98a55e3365b (patch) | |
| tree | fc3c20cbafe3a435af180d59b55579c39830c3ba | |
| parent | adcc67e38e062fff6fc2dbbca3590de558662a7a (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 . |