Resolve merge conflict with master branch

b668b0bf · nicolargo · 316d693c · 6e3424b6 · b668b0bf
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

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

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