diff options
| author | nicolargo <nicolas@nicolargo.com> | 2019-01-19 16:43:35 +0100 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2019-01-19 16:43:35 +0100 |
| commit | b668b0bf4c54d082538f938f52f3093543fdd693 (patch) | |
| tree | e22028ce8faa72b7e47379a239d89e1c838c76ec | |
| parent | 316d693c97ed33296590383529f4601340b03bb9 (diff) | |
| parent | 6e3424b6e021ecdbb513219b3cd4c956040f6da6 (diff) | |
Resolve merge conflict with master branchv3.1.0
| -rw-r--r-- | docs/man/glances.1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 1ae3fa51..1d400bb2 100644 --- 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 . |