</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">
{{ endif }}
</div>
<div class="wall-item-location">$item.location </div>
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-
-=======
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-comment-wrapper" >
$item.comment
-</div>
+</div>
\ No newline at end of file