mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict

This commit is contained in:
nicolargo 2020-08-19 10:47:35 +02:00
parent 3e299249a5 f45147ca60
commit 43df8a887a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/glances.conf
View File

@ -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

4
docs/man/glances.1
View File

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