nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forgot a merge conflict

Browse source
This commit is contained in:
Raphael 2010-09-22 21:39:22 -07:00
parent 2489f8503f
commit cc3819c256
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/aspects/manage.html.haml
View file

@ -61,11 +61,4 @@
%div{:id => "add_request_pane_#{aspect.id}"} %div{:id => "add_request_pane_#{aspect.id}"}
= render "requests/new_request", :aspect => aspect = render "requests/new_request", :aspect => aspect
<<<<<<< HEAD
%p
%br
= link_to t('.update_aspects'), '#', :class => 'button', :id => "move_friends_link"
=======
>>>>>>> master
#content_bottom #content_bottom