diff options
Diffstat (limited to 'view/theme/diabook/wallwall_item.tpl')
| -rw-r--r-- | view/theme/diabook/wallwall_item.tpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index 3b103745b..4f0a2e25f 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -52,6 +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"> @@ -88,7 +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"> |