mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shikhir Arora
2017-02-15 19:57:22 -05:00
parent 7aa86b313b 77f0a3b4ee
commit d8481a009d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NadekoBot/Resources/CommandStrings.resx
View File

@@ -3114,9 +3114,6 @@
<data name="timezone_usage" xml:space="preserve"> <data name="timezone_usage" xml:space="preserve">
<value>`{0}timezone`</value> <value>`{0}timezone`</value>
</data> </data>
<<<<<<< HEAD
</root>
=======
<data name="languagesetdefault_cmd" xml:space="preserve"> <data name="languagesetdefault_cmd" xml:space="preserve">
<value>langsetdefault langsetd</value> <value>langsetdefault langsetd</value>
</data> </data>
@@ -3145,4 +3142,3 @@
<value>`{0}langli`</value> <value>`{0}langli`</value>
</data> </data>
</root> </root>
>>>>>>> Kwoth/dev