From cc3819c256a0db250fe70e832d17f64e5e9b4fce Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 22 Sep 2010 21:39:22 -0700
Subject: [PATCH] Forgot a merge conflict

---
 app/views/aspects/manage.html.haml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 251a8d9a6..af64fcc23 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -61,11 +61,4 @@
           %div{:id => "add_request_pane_#{aspect.id}"}
             = render "requests/new_request", :aspect => aspect
 
-<<<<<<< HEAD
-%p
-  %br
-  = link_to t('.update_aspects'), '#', :class => 'button', :id => "move_friends_link"
-
-=======
->>>>>>> master
 #content_bottom