nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-01 14:08:34 +03:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflict with master branch

Browse Source
This commit is contained in:
nicolargo 2019-01-19 16:43:35 +01:00
commit b668b0bf4c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/man/glances.1
View File

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