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/paste/langs/sl_dlg.js | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/js/tiny_mce/plugins/paste/langs/sl_dlg.js b/program/js/tiny_mce/plugins/paste/langs/sl_dlg.js
index c16d5ce..eca8bd1 100644
--- a/program/js/tiny_mce/plugins/paste/langs/sl_dlg.js
+++ b/program/js/tiny_mce/plugins/paste/langs/sl_dlg.js
@@ -1,5 +1 @@
-tinyMCE.addI18n('sl.paste_dlg',{
-text_title:"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno.",
-text_linebreaks:"Obdr\u017Ei prelome vrstic",
-word_title:"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno."
-});
\ No newline at end of file
+tinyMCE.addI18n('sl.paste_dlg',{"word_title":"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno.","text_linebreaks":"Obdr\u017ei prelome vrstic","text_title":"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno."});
\ No newline at end of file
--
Gitblit v1.9.1