Skip to content
Snippets Groups Projects
Commit 48c01109 authored by Mateus Rambo Strey's avatar Mateus Rambo Strey
Browse files

remove merge conflict junk

parent 54a242dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/users_controller.rb
+ 0
− 1
View file @ 48c01109
...@@ -26,7 +26,6 @@ class UsersController < ApplicationController ...@@ -26,7 +26,6 @@ class UsersController < ApplicationController
redirect_to action: :me redirect_to action: :me
end end
end end
>>>>>>> master
end end
end end
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment