Resolve conflict

nicolargo · Aug 19, 2020 · 43df8a8 · 43df8a8
2 parents 3e29924 + f45147c
commit 43df8a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/conf/glances.conf b/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

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