Permalink
Browse files

Merge conflict

  • Loading branch information...
2 parents e958082 + dd75f2a commit a5eb6e2960cadd1cc972069114f87376cca76435 @SeanRoberts committed Mar 29, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 app/controllers/friends_controller.rb
@@ -35,5 +35,4 @@ def destroy
flash[:notice] = "Sorry it didn't work out with #{@friend.name}."
redirect_to friends_path
end
-
end

0 comments on commit a5eb6e2

Please sign in to comment.