Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / wallwall_item.tpl

diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 4f0a2e25fd189f142dbb2c0a0c8a355505fd69df..e02e5a8becc6ca942cb40daaa9c46572cb562d66 100644 (file)
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,10 +52,7 @@
 
                </div>
                <div class="wall-item-actions">
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-=======
 
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
                        <div class="wall-item-actions-social">
                        
                        
@@ -92,10 +89,6 @@
                                {{ endif }}
                        </div>
                        <div class="wall-item-location">$item.location&nbsp;</div>
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-
-=======
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
                </div>
        </div>
        <div class="wall-item-bottom">
@@ -107,4 +100,4 @@
 
 <div class="wall-item-comment-wrapper" >
        $item.comment
-</div>
+</div>
\ No newline at end of file