Update CommandStrings.resx

2017-02-15 07:16:23 -05:00 · 2017-02-15 07:16:23 -05:00 · 77f0a3b4ee
commit 77f0a3b4ee
parent 26e769c6dd
1 changed files with 0 additions and 4 deletions
--- 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