From: Andy Lester <andy@petdance.com>
Date: Fri, 5 Mar 2010 22:13:17 +0000 (-0600)
Subject: fixed conflict with main branch
X-Git-Tag: 2.15.1~48^2~14
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=a5cde1c56ed43c1c0a01c1a179ebda671f710b35;p=check_postgres.git

fixed conflict with main branch
---

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},