From 25a244908b21b097f744c7194e4862ca6ebda391 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 05:43:11 -0500
Subject: [PATCH] Remove merge conflict
---
program/steps/mail/move_del.inc | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 9a8b4a3..26c7245 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -32,11 +32,7 @@
// move messages
if ($RCMAIL->action == 'move' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
-<<<<<<< HEAD
$target = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
-=======
- $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
->>>>>>> 010a350715f1a36eab666fe26d3118ed025133c1
$trash = $RCMAIL->config->get('trash_mbox');
foreach (rcmail_get_uids() as $mbox => $uids) {
--
Gitblit v1.9.1