chiark / gitweb /
Resolve the Conflict
authorJinbuhm Kim <jinbuhm.kim@gmail.com>
Fri, 14 Nov 2014 11:46:15 +0000 (20:46 +0900)
committerJinbuhm Kim <jinbuhm.kim@gmail.com>
Fri, 14 Nov 2014 11:46:15 +0000 (20:46 +0900)
commitbf37eedd4246396e9c2b38a23aa2fc83d309f2dd
tree41234c65eec1510335ffde64abc59b64fe6c5c87
parentda6e116c3528d63f65a7656e55b09ac8b6f78c9e
parent28b04d8867028cd2a590d8c69c01cc359da74e87
Resolve the Conflict
resources/locale/ko/LC_MESSAGES/Cura.mo
resources/locale/ko/LC_MESSAGES/Cura.po