[icinga-checkins] icinga.org: icinga-core/fholzer/core: mondays...-> delete merge conflict lines

git at icinga.org git at icinga.org
Mon Apr 23 14:16:24 CEST 2012


Module: icinga-core
Branch: fholzer/core
Commit: 9d764d33de30f9e01538e80de0bc4397bf8448e8
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9d764d33de30f9e01538e80de0bc4397bf8448e8

Author: Franz Holzer <office at frankstar.at>
Date:   Mon Apr 23 14:16:04 2012 +0200

mondays...-> delete merge conflict lines

---

 tools/icinga_verification.pl |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/tools/icinga_verification.pl b/tools/icinga_verification.pl
index c3ae496..b121666 100644
--- a/tools/icinga_verification.pl
+++ b/tools/icinga_verification.pl
@@ -52,12 +52,10 @@ my $config_ref = {
 ################################
 # Option parsing
 ################################
-<<<<<<< HEAD
-=======
+
 my $mysqldb = '';
 my $verbose; 
 my $result = GetOptions( "verbose" => \$verbose );
->>>>>>> fholzer/core-formorer
 
 ################################
 # Script Config





More information about the icinga-checkins mailing list