From fc09a45b5817b2d03235173a8ab5cef23c4d97bf Mon Sep 17 00:00:00 2001
From: Matthew Zagaja <mzagaja@users.noreply.github.com>
Date: Tue, 27 Feb 2024 20:37:10 -0500
Subject: [PATCH] Update passwords_controller.rb

WE ACTUALLY HAD TO DO THIS YALL
---
 backend/app/controllers/users/passwords_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/app/controllers/users/passwords_controller.rb b/backend/app/controllers/users/passwords_controller.rb
index df85f0f1..291e22f9 100644
--- a/backend/app/controllers/users/passwords_controller.rb
+++ b/backend/app/controllers/users/passwords_controller.rb
@@ -18,8 +18,4 @@ def respond_to_on_destroy
       head :no_content
     end
   end
-<<<<<<< HEAD
 end
-=======
-end
->>>>>>> main