From de7dff2b4e6290454df298c1b5858a6c98213f2f Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 26 Aug 2020 10:01:14 +0200 Subject: merge conflict in manpage? #1712 --- docs/man/glances.1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/man/glances.1 b/docs/man/glances.1 index e42a8e58..54bd3bbf 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -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 . -- cgit v1.2.3