From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/js/tiny_mce/plugins/emotions/langs/ms_dlg.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/emotions/langs/ms_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/ms_dlg.js
old mode 100755
new mode 100644
index 28d8e25..fd03f6a
--- a/program/js/tiny_mce/plugins/emotions/langs/ms_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/ms_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('ms.emotions_dlg',{cry:"Menangis",cool:"Tampan",desc:"Simbol Emosi",title:"Masukkan emosi",yell:"Menguap",wink:"Kenyit",undecided:"Tak pasti",tongue_out:"Jelir lidah",surprised:"Terkejut",smile:"Senyum",sealed:"Kacip",money_mouth:"Duit mulut",laughing:"Gelak",kiss:"Cium",innocent:"Tidak bersalah",frown:"Mengerut",foot_in_mouth:"Kaki dalam mulut",embarassed:"Malu"});
\ No newline at end of file
+tinyMCE.addI18n('ms.emotions_dlg',{cry:"Menangis",cool:"Tampan",desc:"Simbol Emosi",title:"Masukkan emosi",yell:"Menguap",wink:"Kenyit",undecided:"Tak pasti","tongue_out":"Jelir lidah",surprised:"Terkejut",smile:"Senyum",sealed:"Kacip","money_mouth":"Duit mulut",laughing:"Gelak",kiss:"Cium",innocent:"Tidak bersalah",frown:"Mengerut","foot_in_mouth":"Kaki dalam mulut",embarassed:"Malu"});
\ No newline at end of file

--
Gitblit v1.9.1