Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixing heroku deployment errors 3.1 via heroku logs

  • Loading branch information...
commit 9490cee2f36f755c11294889beace9c3bee459f3 1 parent 949843e
@danashan authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 app/controllers/users_controller.rb
View
5 app/controllers/users_controller.rb
@@ -1,11 +1,10 @@
class UsersController < ApplicationController
-<<<<<<< HEAD
+
def show
@user = User.find(params[:id])
end
-=======
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
+
def new
@title = "Sign up"
end
Please sign in to comment.
Something went wrong with that request. Please try again.