Merge remote-tracking branch 'origin/dev' into dev

2017-02-15 19:57:22 -05:00
parent 7aa86b313b 77f0a3b4ee
commit d8481a009d
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