From 93bdf4500aaaf566c0403b428ab77e22a3b9f763 Mon Sep 17 00:00:00 2001
From: "DESKTOP-UH65DCE\\MusTanG" <donkeypunch.info@gmail.com>
Date: Wed, 25 Oct 2017 15:28:21 -0500
Subject: [PATCH] remove github lines

---
 Sources/epoch_config/Configs/CfgBaseBuilding.hpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
index e580dab2..4f21f14f 100644
--- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
+++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
@@ -286,19 +286,12 @@ class CfgBaseBuilding
     };
     class WoodHalfFloor_SIM_EPOCH : WoodHalfFloor_EPOCH
     {
-<<<<<<< HEAD
         allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"};
-=======
-        allowedSnapPoints[] = {"NF","SF","EF","WF","NQF","SQF","EQF","WQF","C"};
->>>>>>> origin/experimental
         allowedSnapObjects[] = {"Const_floors_static_F"};
         upgradeBuilding[] = {};
         removeParts[] = {};
     };
     class WoodHalfFloor_Ghost_EPOCH : WoodHalfFloor_SIM_EPOCH {};
-<<<<<<< HEAD
-    class MetalFloor_EPOCH : WoodFloor_EPOCH
-=======
 	class WoodQuarterFloor_EPOCH : Default
     {
         upgradeBuilding[] = {{"MetalQuarterFloor_EPOCH",{{"ItemCorrugatedLg",1}}}};
@@ -342,7 +335,6 @@ class CfgBaseBuilding
     };
     class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {};
     class MetalFloor_EPOCH : Default
->>>>>>> origin/experimental
     {
         upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",3},{"MortarBucket",3}}}};
         removeParts[] = {{"ItemCorrugatedLg",1},{"ItemCorrugated",1}};
@@ -364,11 +356,7 @@ class CfgBaseBuilding
     };
     class MetalHalfFloor_SIM_EPOCH : MetalHalfFloor_EPOCH
     {
-<<<<<<< HEAD
         allowedSnapPoints[] = {"NF","SF","EF","WF","NHW","SHW","EHW","WHW"};
-=======
-        allowedSnapPoints[] = {"NF","SF","EF","WF","NQF","SQF","EQF","WQF","C"};
->>>>>>> origin/experimental
         allowedSnapObjects[] = {"Const_floors_static_F"};
         upgradeBuilding[] = {};
         removeParts[] = {};
@@ -385,11 +373,7 @@ class CfgBaseBuilding
     };
     class MetalQuarterFloor_SIM_EPOCH : MetalQuarterFloor_EPOCH
     {
-<<<<<<< HEAD
         allowedSnapPoints[] = {"NHW","SHW","EHW","WHW","NQ1","NQ2","SQ1","SQ2","EQ1","EQ2","WQ1","WQ2"};
-=======
-        allowedSnapPoints[] = {"NQF","SQF","EQF","WQF","C"};
->>>>>>> origin/experimental
         allowedSnapObjects[] = {"Const_floors_static_F"};
         upgradeBuilding[] = {};
         removeParts[] = {};