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

diff --git a/program/js/tiny_mce/plugins/emotions/langs/fr_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/fr_dlg.js
old mode 100755
new mode 100644
index 93d1f43..971cf09
--- a/program/js/tiny_mce/plugins/emotions/langs/fr_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/fr_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('fr.emotions_dlg',{cry:"En pleurs",cool:"Cool",desc:"\u00c9motic\u00f4nes",title:"Ins\u00e9rer une \u00e9motic\u00f4ne",yell:"Criant",wink:"Clin d\'\u0153il",undecided:"Incertain",tongue_out:"Langue tir\u00e9e",surprised:"Surpris",smile:"Sourire",sealed:"Bouche cousue",money_mouth:"Avare",laughing:"Rigolant",kiss:"Bisou",innocent:"Innocent",frown:"D\u00e9\u00e7u",foot_in_mouth:"Pied de nez",embarassed:"Embarrass\u00e9"});
\ No newline at end of file
+tinyMCE.addI18n('fr.emotions_dlg',{cry:"En pleurs",cool:"Cool",desc:"\u00c9motic\u00f4nes",title:"Ins\u00e9rer une \u00e9motic\u00f4ne",yell:"Criant",wink:"Clin d\'\u0153il",undecided:"Incertain","tongue_out":"Langue tir\u00e9e",surprised:"Surpris",smile:"Sourire",sealed:"Bouche cousue","money_mouth":"Avare",laughing:"Rigolant",kiss:"Bisou",innocent:"Innocent",frown:"D\u00e9\u00e7u","foot_in_mouth":"Pied de nez",embarassed:"Embarrass\u00e9",usage:"Utilisez les fl\u00e8ches gauche et droite pour naviguer."});
\ No newline at end of file

--
Gitblit v1.9.1