diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
| commit | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch) | |
| tree | a9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /include/zot.php | |
| parent | 79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff) | |
| parent | 34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff) | |
| download | volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2 volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 828194c3a..3d59f00f3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1674,8 +1674,6 @@ function process_location_delivery($sender,$arr,$deliveries) { logger('process_location_delivery: results: ' . print_r($x,true), LOGGER_DATA); } -// We need to merge this code with that in the import_xchan function so as to make it -// easier to maintain changes. function sync_locations($sender,$arr,$absolute = false) { |