<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
=======
>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
$item.location
=======
$item.location
>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl