diff options
Diffstat (limited to 'view/theme/diabook/wallwall_item.tpl')
| -rw-r--r-- | view/theme/diabook/wallwall_item.tpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index e02e5a8be..4f0a2e25f 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -52,7 +52,10 @@ </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"> @@ -89,6 +92,10 @@ {{ 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"> @@ -100,4 +107,4 @@ <div class="wall-item-comment-wrapper" > $item.comment -</div>
\ No newline at end of file +</div> |