From 0faadc8c25701bbc441d77920f69a0edc5327815 Mon Sep 17 00:00:00 2001
From: TabDragon <31097001+TabDragon@users.noreply.github.com>
Date: Wed, 20 Dec 2017 23:15:17 +0100
Subject: [PATCH] Fixed Merge Errors

---
 Source/CMakeLists.txt                                          | 1 -
 .../AbstractionLayers/DestructionPower/DestructionPower.h      | 1 +
 Source/header.h                                                | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index efd787f..ef2e6ee 100644
--- a/Source/CMakeLists.txt
+++ b/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})
diff --git a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h
index dcc4ee9..0aca98f 100644
--- a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h
+++ b/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>
diff --git a/Source/header.h b/Source/header.h
index 2529a15..0160c60 100755
--- a/Source/header.h
+++ b/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
  */