diff options
| author | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:44:24 +0200 |
|---|---|---|
| committer | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:52:26 +0200 |
| commit | c29ddd58bf64fc81abe18ebcd2bbaf12c0e61ef5 (patch) | |
| tree | c9370af4e72c566093c915298057b641b0628620 /man | |
| parent | 09bdb9de74281553bca86fc0746493ad1987d1ce (diff) | |
Fix leftovers from merge conflict
Diffstat (limited to 'man')
| -rw-r--r-- | man/glances.1 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/man/glances.1 b/man/glances.1 index 08b87183..cd3e9c0a 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,17 +1,9 @@ -<<<<<<< HEAD -.TH glances 1 "May, 2014" "version 1.7.7" "USER COMMANDS" -======= .TH glances 1 "June, 2014" "version 2.0" "USER COMMANDS" ->>>>>>> release/v2.0 .SH NAME glances \- A cross-platform curses-based system monitoring tool .SH SYNOPSIS .B glances -<<<<<<< HEAD -[\-bdehmnrsvyz1] [\-B bind] [\-c server] [\-C conffile] [\-p port] [\-P password] [\-\-password] [\-t refresh] [\-f file] [\-o output] -======= .RI [ OPTIONS ] ->>>>>>> release/v2.0 .SH DESCRIPTION Glances is a free (LGPL) cross-platform curses-based system monitoring tool which aims to present a maximum of information in a minimum of space, ideally to fit in @@ -45,13 +37,8 @@ connect to a Glances server by IPv4/IPv6 address or hostname .B \-C CONF_FILE, \-\-config CONF_FILE path to the configuration file .TP -<<<<<<< HEAD -.B \-f FOLDER -Set the HTML or CSV output folder -======= .B \-\-disable-bold disable bold mode in the terminal ->>>>>>> release/v2.0 .TP .B \-\-disable-diskio disable disk I/O module |