aboutsummaryrefslogtreecommitdiffstats
path: root/include/Import/refimport.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-23 19:45:39 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-23 19:45:39 -0700
commitcb76fb8b9b659c4ec06e359f375a35a534927b99 (patch)
treecb5a77aa95ea6e510e9e1ccb33238d6de0957ec7 /include/Import/refimport.php
parent833098e3460e0a2c7fbffaa59163af815f419e68 (diff)
downloadvolse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.tar.gz
volse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.tar.bz2
volse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.zip
item flag fixes discovered after a few merges
Diffstat (limited to 'include/Import/refimport.php')
-rw-r--r--include/Import/refimport.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index 7d32e143f..3ef8870ac 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -260,11 +260,7 @@ function reflect_comment_store($channel,$post,$comment,$user) {
$arr['edited'] = $comment['created'];
$arr['author_xchan'] = $hash;
$arr['owner_xchan'] = $channel['channel_hash'];
-<<<<<<< HEAD
$arr['item_origin'] = 1;
-=======
- $arr['item_flags'] = ITEM_ORIGIN;
->>>>>>> master
$arr['item_wall'] = 1;
$arr['verb'] = ACTIVITY_POST;
$arr['comment_policy'] = 'contacts';