Resolve the Conflict

diff --git a/resources/locale/ko/LC_MESSAGES/Cura.mo b/resources/locale/ko/LC_MESSAGES/Cura.mo
index 2934e04efc310748b73cd1305e3512831be4597b..2e102a49f0b226e2f9f5d7002425a4ddf58c7fa4 100644 (file)
Binary files a/resources/locale/ko/LC_MESSAGES/Cura.mo and b/resources/locale/ko/LC_MESSAGES/Cura.mo differ

diff --git a/resources/locale/ko/LC_MESSAGES/Cura.po b/resources/locale/ko/LC_MESSAGES/Cura.po
index 46504a221024c757b57374c40bb497b6bcac035f..3bb8b3c5c8bdb7ec52836d5ac4b300928ad1a8d0 100644 (file)
--- a/resources/locale/ko/LC_MESSAGES/Cura.po
+++ b/resources/locale/ko/LC_MESSAGES/Cura.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Cura Translation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-22 10:17+0200\n"
-"PO-Revision-Date: 2014-11-14 20:27+0900\n"
+"PO-Revision-Date: 2014-11-14 20:43+0900\n"
 "Last-Translator: Jinbuhm Kim <Jinbuhm.Kim@gmail.com>\n"
 "Language-Team: Korean <Jinbuhm.Kim@gmail.com>\n"
 "MIME-Version: 1.0\n"