Fixed Merge Errors

Source/CMakeLists.txt

@@ -10,7 +10,6 @@ set(SOURCE_FILES
         functions/solve/classExtension.cpp
         functions/solve/structure.cpp
         functions/AbstractionLayers/AbstraktionLayer_Base.h
-        functions/AbstractionLayers/DestructionPower/DestructionPower.cpp
         )
 add_executable(PuzzleSolver ${SOURCE_FILES})
 include_directories(${OpenCV_INCLUDE_DIRS})

Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h

@@ -9,6 +9,7 @@
 #define DESTRUCTION_COUNT 1
 
 #include "../AbstraktionLayer_Base.h"
+#include "DestructionPower_Properties.h"
 #include <vector>
 #include <iostream>
 #include <bitset>

Source/header.h

@@ -11,9 +11,6 @@
 
 using namespace std;
 
-
-#include "header/input.h"
-
 /**
  * IMPORTANT: Each new layer must be included there, to avoid compile errors
  */