Resolve app/controllers/passwords_controller.rb

df598db2 · Robert Speicher · 056d4e76 · df598db2
Commit df598db2 authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/passwords_controller.rb app/controllers/passwords_controller.rb +0 -3

No files found.
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -5,11 +5,8 @@ class PasswordsController < Devise::PasswordsController
  before_action :check_password_authentication_available, only: [:create]
  before_action :throttle_reset,      only: [:create]

-<<<<<<< HEAD
  prepend EE::PasswordsController

-=======
->>>>>>> upstream/master
  # rubocop: disable CodeReuse/ActiveRecord
  def edit
    super