Resolve conflict

conf/glances.conf

@@ -4,7 +4,7 @@
 
 [global]
 # Does Glances should check if a newer version is available on PyPI ?
-check_update=true
+check_update=false
 # History size (maximum number of values)
 # Default is 28800: 1 day with 1 point every 3 seconds
 history_size=28800

docs/man/glances.1

 .\" 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
 .