From 5c526995d8534465602775dfddebd8d77855d2e2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 28 Sep 2015 19:07:31 -0700 Subject: [PATCH] resolve conflicts --- include/zot.php | 7 ------- install/update.php | 3 --- 2 files changed, 10 deletions(-) diff --git a/include/zot.php b/include/zot.php index eaaf30fff..ef9f325d0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1587,13 +1587,6 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $channel = $r[0]; $DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); - if($d['hash'] === $sender['hash']) { - $DR->update('self delivery ignored'); - $result[] = $DR->get(); - continue; - } - - if($d['hash'] === $sender['hash']) { $DR->update('self delivery ignored'); $result[] = $DR->get(); diff --git a/install/update.php b/install/update.php index ca4e90a9d..ace5239b5 100644 --- a/install/update.php +++ b/install/update.php @@ -1885,6 +1885,3 @@ function update_r1155() { return UPDATE_FAILED; } -function update_r1155() { - return UPDATE_SUCCESS; -}