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

merge conflict in manpage? #1712

pull/1715/head
nicolargo 2020-08-26 10:01:14 +02:00
parent e803152260
commit de7dff2b4e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/man/glances.1
View File

@ -1,10 +1,6 @@
.\" 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
.