diff options
| author | nicolargo <nicolas@nicolargo.com> | 2020-08-19 10:47:35 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2020-08-19 10:47:35 +0200 |
| commit | 43df8a887ade2727533a52e1d12580d25dd4b56c (patch) | |
| tree | 4aedd742e7502c06fb3561e7e9bb6c39554f1e58 | |
| parent | 3e299249a5cee2c5ae9f7de2ab7d078d62951f64 (diff) | |
| parent | f45147ca60affc88a2da8b2435fda34613f74021 (diff) | |
Resolve conflictv3.1.5
| -rw-r--r-- | conf/glances.conf | 2 | ||||
| -rw-r--r-- | docs/man/glances.1 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/glances.conf b/conf/glances.conf index 50e4f425..a9802d7f 100644 --- 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 index 54bd3bbf..e42a8e58 100644 --- 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 . |