diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 22:00:15 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 22:00:15 -0700 |
| commit | 90a31f4ad511e8d53ebbf70397227c1804bb8ad0 (patch) | |
| tree | 46be4a0b63164b8407c26c81669cbad75c231824 /include/zot.php | |
| parent | 1a5898bf80246fca87ecd7a56f9b7e4780e4089c (diff) | |
| parent | 065a50c920ebfe2274ab134bca7849051f3582e7 (diff) | |
| download | volse-hubzilla-90a31f4ad511e8d53ebbf70397227c1804bb8ad0.tar.gz volse-hubzilla-90a31f4ad511e8d53ebbf70397227c1804bb8ad0.tar.bz2 volse-hubzilla-90a31f4ad511e8d53ebbf70397227c1804bb8ad0.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index 9497e4668..31a12b763 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2907,7 +2907,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $abook['abook_feed'] = 1; } - $clean = array(); if($abook['abook_xchan'] && $abook['entry_deleted']) { logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']); |