Merged more conflicts

app/controllers/door_logs_controller.rb

@@ -1,10 +1,7 @@
 class DoorLogsController < ApplicationController
-<<<<<<< HEAD
-=======
   authorize_resource
   before_filter :authenticate_user!
 
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
   # GET /door_logs
   # GET /door_logs.json
   def index

app/controllers/users_controller.rb

@@ -1,10 +1,4 @@
 class UsersController < ApplicationController
-<<<<<<< HEAD
-  # GET /users
-  # GET /users.json
-  def index
-    @users = User.all
-=======
   load_and_authorize_resource
   before_filter :authenticate_user!
   
@@ -13,7 +7,6 @@ class UsersController < ApplicationController
   def index
     #@users = User.all
     #authorize! :read, @users
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # index.html.erb
@@ -24,11 +17,7 @@ class UsersController < ApplicationController
   # GET /users/1
   # GET /users/1.json
   def show
-<<<<<<< HEAD
-    @user = User.find(params[:id])
-=======
     #@user = User.find(params[:id])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # show.html.erb
@@ -38,11 +27,7 @@ class UsersController < ApplicationController
 
   # PUT /users/1/upload
   def upload
-<<<<<<< HEAD
-    @user = User.find(params[:id])
-=======
     #@user = User.find(params[:id])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
     @upload_result = @user.upload_to_door
 
     respond_to do |format|
@@ -64,11 +49,7 @@ class UsersController < ApplicationController
   # GET /users/new
   # GET /users/new.json
   def new
-<<<<<<< HEAD
-    @user = User.new
-=======
     #@user = User.new
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # new.html.erb
@@ -78,21 +59,13 @@ class UsersController < ApplicationController
 
   # GET /users/1/edit
   def edit
-<<<<<<< HEAD
-    @user = User.find(params[:id])
-=======
     #@user = User.find(params[:id])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
   end
 
   # POST /users
   # POST /users.json
   def create
-<<<<<<< HEAD
-    @user = User.new(params[:user])
-=======
     #@user = User.new(params[:user])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       if @user.save
@@ -108,11 +81,7 @@ class UsersController < ApplicationController
   # PUT /users/1
   # PUT /users/1.json
   def update
-<<<<<<< HEAD
-    @user = User.find(params[:id])
-=======
     #@user = User.find(params[:id])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       if @user.update_attributes(params[:user])
@@ -128,11 +97,7 @@ class UsersController < ApplicationController
   # DELETE /users/1
   # DELETE /users/1.json
   def destroy
-<<<<<<< HEAD
-    @user = User.find(params[:id])
-=======
     #@user = User.find(params[:id])
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
     @user.destroy
 
     respond_to do |format|