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

diff --git a/program/js/tiny_mce/plugins/emotions/langs/nl_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/nl_dlg.js
old mode 100755
new mode 100644
index ac4bb4c..0e7d7ba
--- a/program/js/tiny_mce/plugins/emotions/langs/nl_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/nl_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('nl.emotions_dlg',{cry:"Huilen",cool:"Stoer",desc:"Emoties",title:"Emotie invoegen",yell:"Roepen",wink:"Knipogen",undecided:"Onbeslist",tongue_out:"Tong uitsteken",surprised:"Verrast",smile:"Lachen",sealed:"Afgesloten",money_mouth:"Hebberig",laughing:"Lachen",kiss:"Zoenen",innocent:"Onschuldig",frown:"Wenkbrauw ophalen",foot_in_mouth:"Verstomd",embarassed:"Schamen"});
\ No newline at end of file
+tinyMCE.addI18n('nl.emotions_dlg',{cry:"Huilen",cool:"Stoer",desc:"Emoties",title:"Emotie invoegen",yell:"Roepen",wink:"Knipogen",undecided:"Onbeslist","tongue_out":"Tong uitsteken",surprised:"Verrast",smile:"Lachen",sealed:"Afgesloten","money_mouth":"Hebberig",laughing:"Lachen",kiss:"Zoenen",innocent:"Onschuldig",frown:"Wenkbrauw ophalen","foot_in_mouth":"Verstomd",embarassed:"Schamen",usage:"Gebruik linker en rechter pijltjestoetsen om te navigeren."});
\ No newline at end of file

--
Gitblit v1.9.1