Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/js/tiny_mce/plugins/advhr/langs/ko_dlg.js

@@ -1 +1 @@
tinyMCE.addI18n('ko.advhr_dlg',{size:"\ub192\uc774",noshade:"\uadf8\ub9bc\uc790\uc5c6\uc74c",width:"\ud3ed",normal:"Normal",widthunits:"Units"});
tinyMCE.addI18n('ko.advhr_dlg',{size:"\ub192\uc774",noshade:"\uadf8\ub9bc\uc790 \uc5c6\uc74c",width:"\ud3ed",normal:"\ubcf4\ud1b5",widthunits:"\ub2e8\uc704"});