From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses
---
plugins/zipdownload/zipdownload.php | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 535248d..443fef7 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/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);
--
Gitblit v1.9.1