Merge fd9a864 into b668b0b

nicolargo · Mar 13, 2019 · c530dc8 · c530dc8
2 parents b668b0b + fd9a864
commit c530dc8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/man/glances.1 b/docs/man/glances.1
@@ -1,10 +1,6 @@
 .\" 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
 .