Forgot a merge conflict

2010-09-22 21:39:22 -07:00 · 2010-09-22 21:39:22 -07:00 · cc3819c256
commit cc3819c256
parent 2489f8503f
1 changed files with 0 additions and 7 deletions
--- 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