Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/zipdownload/zipdownload.php

@@ -258,11 +258,7 @@
   /**
    * Helper function to convert filenames to the configured charset
    */
<<<<<<< HEAD
   private function _convert_filename($str, $from = RCMAIL_CHARSET)
=======
   private function _convert_filename($str)
>>>>>>> 4922472... Fix zipdownload plugin issue with filenames charset (#1489156)
   {
        $str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);