Merge branch 'master' of github.com:LukeShu/leager

Conflicts:
	app/controllers/sessions_controller.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index c3ff395..9e539ac 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -15,10 +15,10 @@ class SessionsController < ApplicationController
 				sign_in @user
 				format.html { redirect_to root_path }
 			else
-        		format.html { render action: 'new' }
-        		format.json { render json: @user.errors, status: :unprocessable_entity }
-      		end
-      	end
+				format.html { render action: 'new' }
+				format.json { render json: @user.errors, status: :unprocessable_entity }
+			end
+		end
 	end
 
 	# DELETE /sessions/current