diff options
Diffstat (limited to 'view/theme/diabook/wall_item.tpl')
| -rw-r--r-- | view/theme/diabook/wall_item.tpl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 8c892fd2a..6cbab0a71 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,6 +46,10 @@ </div> <div class="wall-item-actions"> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl +======= + +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl <div class="wall-item-actions-social"> @@ -81,7 +85,11 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl <div class="wall-item-location">$item.location </div> +======= + <div class="wall-item-location">$item.location </div> +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl </div> </div> <div class="wall-item-bottom"> |