[icinga-checkins] icinga.org: icinga2/support/2.2: Build fix

git at icinga.org git at icinga.org
Fri Nov 28 13:41:46 CET 2014


Module: icinga2
Branch: support/2.2
Commit: 760370036a77f90ee8b6b79d4697504737357ec6
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=760370036a77f90ee8b6b79d4697504737357ec6

Author: Gunnar Beutner <gunnar at beutner.name>
Date:   Fri Nov 28 13:39:39 2014 +0100

Build fix

---

 test/CMakeLists.txt |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7969884..e454591 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -83,13 +83,8 @@ add_boost_test(base
         base_value/scalar
         base_value/convert
         base_value/format
-<<<<<<< HEAD
-=======
-	config_ops/simple
-	config_ops/advanced
 	icinga_macros/simple
 	icinga_perfdata/empty
->>>>>>> 9dfa3d2... Implement support for arrays in command arguments
 	icinga_perfdata/simple
 	icinga_perfdata/multiple
 	icinga_perfdata/uom



More information about the icinga-checkins mailing list