Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/js/tiny_mce/plugins/paste/langs/en_dlg.js

@@ -1,5 +1 @@
tinyMCE.addI18n('en.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."

});
tinyMCE.addI18n('en.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."});