diff options
| author | Andy Lester | 2010-03-05 22:13:17 +0000 |
|---|---|---|
| committer | Andy Lester | 2010-03-05 22:13:17 +0000 |
| commit | a5cde1c56ed43c1c0a01c1a179ebda671f710b35 (patch) | |
| tree | fd4f0ac2cadbc0b0f87677440c1e58d4f98fb729 /check_postgres.pl | |
| parent | ed5ce3557fa0517b6d9ba8e697ac8b17ed7f8709 (diff) | |
fixed conflict with main branch
Diffstat (limited to 'check_postgres.pl')
| -rwxr-xr-x | check_postgres.pl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/check_postgres.pl b/check_postgres.pl index 5959177de..803a761f7 100755 --- a/check_postgres.pl +++ b/check_postgres.pl @@ -282,12 +282,8 @@ our %msg = ( 'txnwrap-cbig' => q{The 'critical' value must be less than 2 billion}, 'txnwrap-wbig' => q{The 'warning' value must be less than 2 billion}, 'unknown-error' => q{Unknown error}, -<<<<<<< HEAD:check_postgres.pl 'usage' => qq{\nUsage: \$1 <options>\n Try "\$1 --help" for a complete list of options\n Try "\$1 --man" for the full manual\n}, -======= - 'usage' => qq{\nUsage: \$1 <options>\n Try "\$1 --help" for a complete list of options\n\n}, 'username' => q{username}, ->>>>>>> bucardo/master:check_postgres.pl 'vac-msg' => q{DB: $1 TABLE: $2}, 'vac-nomatch-a' => q{No matching tables have ever been analyzed}, 'vac-nomatch-v' => q{No matching tables have ever been vacuumed}, |