From 48c011097af89528310c4a03b14faf2971cbc88a Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Tue, 29 Sep 2015 16:33:23 -0300
Subject: [PATCH] remove merge conflict junk
---
app/controllers/users_controller.rb | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ed2221aa1..8b4904f84 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -26,7 +26,6 @@ class UsersController < ApplicationController
redirect_to action: :me
end
end
->>>>>>> master
end
end
--
GitLab