From b9139f9f98fe994142dd3e050dac1e6ec9a24309 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 9 Jun 2013 15:52:45 +0200
Subject: Fix parse error in broken last commit

---
 plugins/zipdownload/zipdownload.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 535248d7f..443fef728 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -258,11 +258,7 @@ class zipdownload extends rcube_plugin
 	/**
 	 * 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);
 
-- 
cgit v1.2.3