Resolve merge conflict with master branch

nicolargo · Jan 19, 2019 · b668b0b · b668b0b
2 parents 316d693 + 6e3424b
commit b668b0b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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
 .