From a9a02e4fa22f16687d61a26b11c46aac1b24504d Mon Sep 17 00:00:00 2001
From: vbawol <vbawol@veteranbastards.com>
Date: Fri, 11 Sep 2015 09:19:35 -0500
Subject: [PATCH] fix merge issue

---
 Sources/mpmissions/epoch.Altis/description.ext  | 17 -----------------
 .../mpmissions/epoch.Australia/description.ext  | 17 -----------------
 .../mpmissions/epoch.Bornholm/description.ext   | 17 -----------------
 .../mpmissions/epoch.Chernarus/description.ext  | 17 -----------------
 .../epoch.Chernarus_Summer/description.ext      | 17 -----------------
 .../mpmissions/epoch.Esseker/description.ext    | 17 -----------------
 .../mpmissions/epoch.Stratis/description.ext    | 17 -----------------
 .../mpmissions/epoch.Takistan/description.ext   | 17 -----------------
 8 files changed, 136 deletions(-)

diff --git a/Sources/mpmissions/epoch.Altis/description.ext b/Sources/mpmissions/epoch.Altis/description.ext
index cbd4b664..63b6e071 100644
--- a/Sources/mpmissions/epoch.Altis/description.ext
+++ b/Sources/mpmissions/epoch.Altis/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Australia/description.ext b/Sources/mpmissions/epoch.Australia/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Australia/description.ext
+++ b/Sources/mpmissions/epoch.Australia/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Bornholm/description.ext b/Sources/mpmissions/epoch.Bornholm/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Bornholm/description.ext
+++ b/Sources/mpmissions/epoch.Bornholm/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Chernarus/description.ext b/Sources/mpmissions/epoch.Chernarus/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Chernarus/description.ext
+++ b/Sources/mpmissions/epoch.Chernarus/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/description.ext b/Sources/mpmissions/epoch.Chernarus_Summer/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Chernarus_Summer/description.ext
+++ b/Sources/mpmissions/epoch.Chernarus_Summer/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Esseker/description.ext b/Sources/mpmissions/epoch.Esseker/description.ext
index 4459c6e6..f924418a 100644
--- a/Sources/mpmissions/epoch.Esseker/description.ext
+++ b/Sources/mpmissions/epoch.Esseker/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Stratis/description.ext b/Sources/mpmissions/epoch.Stratis/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Stratis/description.ext
+++ b/Sources/mpmissions/epoch.Stratis/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{
diff --git a/Sources/mpmissions/epoch.Takistan/description.ext b/Sources/mpmissions/epoch.Takistan/description.ext
index 5176fd8e..c4debdbe 100644
--- a/Sources/mpmissions/epoch.Takistan/description.ext
+++ b/Sources/mpmissions/epoch.Takistan/description.ext
@@ -36,24 +36,7 @@ wreckLimit = 2;
 wreckRemovalMinTime = 60;
 wreckRemovalMaxTime = 360;
 
-<<<<<<< HEAD
 class cfgFunctions
-=======
-class CfgRemoteExec
-{
-        class Functions
-        {
-                mode = 0;
-                jip = 0;
-        };
-        class Commands
-        {
-                mode=0;
-        };
-};
-
-class CfgEpochClient
->>>>>>> master
 {
 	class A3E
 	{