merge conflict in manpage? #1712

de7dff2b · nicolargo · e8031522 · de7dff2b
隐藏空白更改
内联并排

Showing with 0 addition and 4 deletion

docs/man/glances.1 docs/man/glances.1 +0 -4

未找到文件。
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
 .\" 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
 .