From 7235d5466a4f54cd80d1b661b142ec99230afbf2 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 20:24:55 +0100
Subject: [PATCH] Removed changes

---
 view/theme/diabook/wall_item.tpl     | 14 +++++---------
 view/theme/diabook/wallwall_item.tpl | 16 ++++++----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 6cbab0a715..321bbbe9ea 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,7 +13,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -21,7 +22,8 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -46,10 +48,7 @@
 
 		</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">
 			
 			
@@ -85,11 +84,7 @@
 					<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&nbsp;</div>			
-=======
 			<div class="wall-item-location">$item.location&nbsp;</div>
->>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
@@ -102,3 +97,4 @@
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
+
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 4f0a2e25fd..05ed4cc82c 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,7 +18,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -26,8 +27,10 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
+id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 				 $item.vwall <span class="wall-item-ago">- &nbsp;
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -52,10 +55,7 @@
 
 		</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">
 			
 			
@@ -92,10 +92,6 @@
 				{{ endif }}
 			</div>
 			<div class="wall-item-location">$item.location&nbsp;</div>
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-
-=======
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
-- 
2.39.5