mirror of https://github.com/nicolargo/glances
merge conflict in manpage? #1712
parent
e803152260
commit
de7dff2b4e
|
@ -1,10 +1,6 @@
|
||||||
.\" Man page generated from reStructuredText.
|
.\" Man page generated from reStructuredText.
|
||||||
.
|
.
|
||||||
<<<<<<< HEAD
|
|
||||||
.TH "GLANCES" "1" "Aug 19, 2020" "3.1.5" "Glances"
|
.TH "GLANCES" "1" "Aug 19, 2020" "3.1.5" "Glances"
|
||||||
=======
|
|
||||||
.TH "GLANCES" "1" "Mar 25, 2020" "3.1.4.1" "Glances"
|
|
||||||
>>>>>>> master
|
|
||||||
.SH NAME
|
.SH NAME
|
||||||
glances \- An eye on your system
|
glances \- An eye on your system
|
||||||
.
|
.
|
||||||
|
|
Loading…
Reference in New Issue