Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/hide_blockquote/hide_blockquote.php

@@ -27,11 +27,7 @@
            && ($limit = $rcmail->config->get('hide_blockquote_limit'))
        ) {
            // include styles
            $skin = $rcmail->config->get('skin');
            if (!file_exists($this->home."/skins/$skin/style.css")) {
                $skin = 'default';
            }
            $this->include_stylesheet("skins/$skin/style.css");
            $this->include_stylesheet($this->local_skin_path() . "/style.css");

            // Script and localization
            $this->include_script('hide_blockquote.js');