Resolve conflict in app/controllers/sessions_controller.rb

4cf67df7 · Stan Hu · 11f81cc1 · 4cf67df7
Commit 4cf67df7 authored Jun 21, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,10 +4,7 @@ class SessionsController < Devise::SessionsController
  include Devise::Controllers::Rememberable
  include Recaptcha::ClientHelper
  include Recaptcha::Verify
-<<<<<<< HEAD
  prepend EE::SessionsController
-=======
->>>>>>> upstream/master

  skip_before_action :check_two_factor_requirement, only: [:destroy]