diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-09 15:52:45 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-09 15:52:45 +0200 |
| commit | b9139f9f98fe994142dd3e050dac1e6ec9a24309 (patch) | |
| tree | 5ddc701268c1f2460d34cc916e81568dec7f7c3f | |
| parent | 057b9e3e7f5bd1707e72812b1e5f977face0baed (diff) | |
Fix parse error in broken last commit
| -rw-r--r-- | 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 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); |