Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/js/tiny_mce/plugins/media/editor_plugin_src.js

@@ -382,7 +382,7 @@
         data = JSON.parse(data);

         typeItem = this.getType(node.attr('class'));



         style = node.attr('data-mce-style')

         style = node.attr('data-mce-style');

         if (!style) {

            style = node.attr('style');