Update passwords_controller.rb

WE ACTUALLY HAD TO DO THIS YALL
codeforboston · Feb 28, 2024 · fc09a45 · fc09a45
1 parent 6dcb093
commit fc09a45
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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