From 77f0a3b4ee17caa276b4723f73fdc5c71181f5a6 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 07:16:23 -0500
Subject: [PATCH] Update CommandStrings.resx

---
 src/NadekoBot/Resources/CommandStrings.resx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 6b03349f..69aa41c4 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,9 +3114,6 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-<<<<<<< HEAD
-</root>
-=======
   <data name="languagesetdefault_cmd" xml:space="preserve">
     <value>langsetdefault langsetd</value>
   </data>
@@ -3145,4 +3142,3 @@
     <value>`{0}langli`</value>
   </data>
 </root>
->>>>>>> Kwoth/dev