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

diff --git a/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js
index ac5a815..790050a 100644
--- a/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/gl_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('gl.emotions_dlg',{cry:"Chora",cool:"Guay",desc:"Emoticones",title:"Insertar emoticon",yell:"Anoxado",wink:"Gui\u00f1o",undecided:"Indeciso",tongue_out:"Canso",surprised:"Sorprendido",smile:"Sorriso",sealed:"Selado",money_mouth:"Cartos",laughing:"Risa",kiss:"Beso",innocent:"Inocente",frown:"Triste",foot_in_mouth:"A que dixen",embarassed:"Vergo\u00f1a"});
\ No newline at end of file
+tinyMCE.addI18n('gl.emotions_dlg',{cry:"Chora",cool:"Guay",desc:"Emoticones",title:"Insertar emoticon",yell:"Anoxado",wink:"Gui\u00f1o",undecided:"Indeciso","tongue_out":"Canso",surprised:"Sorprendido",smile:"Sorriso",sealed:"Selado","money_mouth":"Cartos",laughing:"Risa",kiss:"Beso",innocent:"Inocente",frown:"Triste","foot_in_mouth":"A que dixen",embarassed:"Vergo\u00f1a"});
\ No newline at end of file

--
Gitblit v1.9.1