git-svn-id: http://svn.centreon.com/Plugins/Dev@2667 6bcd3966-0018-0410-8128-fd23d134de7e

2007-07-11 16:30:22 +00:00 · 2007-07-11 16:30:22 +00:00 · 5242f0ac09
parent f15b91c114
commit 5242f0ac09
1 changed files with 0 additions and 4 deletions
--- a/src/check_centreon_TcpConn
+++ b/src/check_centreon_TcpConn
@ -52,12 +52,8 @@ GetOptions
     "V"   => \$opt_V, "version"      => \$opt_V,
     "H=s"   => \$opt_H, "Hostname"     => \$opt_H,
     "p=i"   => \$opt_p, "port"         => \$opt_p,
-<<<<<<< .mine
-     "C=s"   => \$opt_c, "Community"    => \$opt_c
-=======
     "C=s"   => \$opt_C, "Community"    => \$opt_C, 
     "c=s"	=> \$opt_c, "w=s"	=> \$opt_w
->>>>>>> .r479
 );

 if ($opt_V) {