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/si_dlg.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/emotions/langs/si_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/si_dlg.js
old mode 100755
new mode 100644
index 387b6e6..cc41b25
--- a/program/js/tiny_mce/plugins/emotions/langs/si_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/si_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('si.emotions_dlg',{cry:"Cry",cool:"Cool",desc:"Emotions",title:"Insert emotion",yell:"Yell",wink:"Wink",undecided:"Undecided",tongue_out:"Tongue out",surprised:"Surprised",smile:"Smile",sealed:"Sealed",money_mouth:"Money mouth",laughing:"Laughing",kiss:"Kiss",innocent:"Innocent",frown:"Frown",foot_in_mouth:"Foot in mouth",embarassed:"Embarassed"});
\ No newline at end of file
+tinyMCE.addI18n('si.emotions_dlg',{cry:"Cry",cool:"Cool",desc:"Emotions",title:"Insert emotion",yell:"Yell",wink:"Wink",undecided:"Undecided","tongue_out":"Tongue out",surprised:"Surprised",smile:"Smile",sealed:"Sealed","money_mouth":"Money mouth",laughing:"Laughing",kiss:"Kiss",innocent:"Innocent",frown:"Frown","foot_in_mouth":"Foot in mouth",embarassed:"Embarassed"});
\ No newline at end of file

--
Gitblit v1.9.1