Skip to content

Commit

Permalink
Resolve merge conflict with master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolargo committed Jan 19, 2019
2 parents 316d693 + 6e3424b commit b668b0b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docs/man/glances.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.\" 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
.
Expand Down

0 comments on commit b668b0b

Please sign in to comment.