fixed conflic when pull master item remark

app/controllers/home_controller.rb

@@ -5,7 +5,7 @@ class HomeController < ApplicationController
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.order("name asc")
-     @login_form = LoginForm.new()
+    @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
 
@@ -59,7 +59,7 @@ class HomeController < ApplicationController
          render :index
       end
     else
-      redirect_to origami_root_path, :notice => "Username and Password doesn't match!"
+      redirect_to root_path, :notice => "Username and Password doesn't match!"
     end
 
   end