summaryrefslogtreecommitdiffstats
path: root/docs/man/glances.1
diff options
context:
space:
mode:
Diffstat (limited to 'docs/man/glances.1')
-rw-r--r--docs/man/glances.14
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
.