From fbedaf9b8df4d84029edcccfbe552bd70eaca031 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Fri, 4 Mar 2016 14:59:12 -0500
Subject: [PATCH] Remove merge conflict markers

@icomrade - I'm going to start reviewing and testing the commits you've
done here. I'll commit any fixes and additional 1.8.7 stuff that is
needed to this 1.8.7-Rebase branch. Once we have it in a functional
state we can merge it into master if that's good with you.

Let me know if you are working on any files in particular so we don't
duplicate efforts. I'll be in discord while I'm working here too.
---
 SQF/dayz_epoch_b/stringtable.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml
index 431928ebb..e120f273a 100644
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
@@ -285,8 +285,6 @@
 			<French>Vous utilisez une version incorrecte de DAYZ_CODE, veuillez télécharger ce fichier depuis dayzepoch.com (Vous utilisez la version %1 et le serveur utilise la version %2)</French>
 			<Czech>Máte nesprávnou verzi DAYZ_CODE, stáhněte si prosím aktuální soubor z dayzepoch.com (Vaše verze je %1 a na serveru běží verze %2)</Czech>
 		</Key>
-<<<<<<< HEAD
-=======
 		<Key ID="str_player_20">
 			<Original>\n\nYou must be near a water-source such as a pond or well to refill your water bottles</Original>
 			<English>\n\nYou must be near a water-source such as a pond or well to refill your water bottles</English>
@@ -801,7 +799,6 @@
 			<French>FEMME</French>
 			<Czech>ŽENA</Czech>
 		</Key>
->>>>>>> upstream/master
 	</Package>
 	<Package name="playerstats">
 		<Key ID="str_playerstats_bandit">
@@ -1339,8 +1336,6 @@
 			<French>Améliorer %1</French>
 			<Czech>Vylepšit %1</Czech>
 		</Key>
-<<<<<<< HEAD
-=======
 		<Key ID="str_actions_medical_14">
 			<Original>Unload patients from %1</Original>
 			<English>Unload patients from %1</English>
@@ -1409,7 +1404,6 @@
 			<French>Examiner le corps</French>
 			<Czech>Prozkoumat tělo</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_ACTIONS_BUILD_EPOCH">
 			<Original>Build %1</Original>
 			<English>Build %1</English>
@@ -1542,8 +1536,6 @@
 		</Key>
 	</Package>
 	<Package name="equipment_code">
-<<<<<<< HEAD
-=======
 		<Key ID="STR_CRAFT_NAME_X">
 			<English>Craft Blueprint</English>
 			<German>Blaupause erstellen</German>
@@ -3122,7 +3114,6 @@
 			<French>Votre couteau semble trop émoussé</French>
 			<Czech>Vypadá to, že tvůj nůž je příliš tupý.</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_FOOD_EQIP_CODE_NAME_0">
 			<Original>Raw Meat</Original>
 			<English>Raw Meat</English>
@@ -3252,9 +3243,7 @@
 			<Dutch>Rundersteak</Dutch>
 			<French>Bifteck</French>
 			<Czech>Hovězí maso</Czech>
-		</Key>
-<<<<<<< HEAD
-=======
+		</Key>		
 		<Key ID="STR_FOODCOOKED_EQUIP_CODE_DESC_6">
 			<Original>Beefsteak to be used for sustainment.</Original>
 			<English>Beefsteak to be used for sustainment.</English>
@@ -3669,7 +3658,6 @@
 			<French>Une boîte intacte d'haricots noirs "Griff".</French>
 			<Czech>Čistá, ještě neotevřená plechovka Griffových černých fazolí.</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_FOOD_NAME_CAN_GRIFF_EMPTY">
 			<Original>Tin Can</Original>
 			<English>Tin Can</English>