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/hi_dlg.js | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/js/tiny_mce/plugins/paste/langs/hi_dlg.js b/program/js/tiny_mce/plugins/paste/langs/hi_dlg.js
index 6f3b0f7..51c6566 100644
--- a/program/js/tiny_mce/plugins/paste/langs/hi_dlg.js
+++ b/program/js/tiny_mce/plugins/paste/langs/hi_dlg.js
@@ -1,5 +1 @@
-tinyMCE.addI18n('hi.paste_dlg',{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-});
\ No newline at end of file
+tinyMCE.addI18n('hi.paste_dlg',{"word_title":"Use CTRL+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep linebreaks","text_title":"Use CTRL+V on your keyboard to paste the text into the window."});
\ No newline at end of file
--
Gitblit v1.9.1