Fixed Merge Errors

2017-12-20 23:15:17 +01:00
parent 9720613543
commit 0faadc8c25
3 changed files with 1 additions and 4 deletions
--- 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>