Resolve app/controllers/confirmations_controller.rb

998e1c8d · Lin Jen-Shin · 5e092f01 · 998e1c8d
Commit 998e1c8d authored May 17, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

app/controllers/confirmations_controller.rb app/controllers/confirmations_controller.rb +1 -3

No files found.
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
 class ConfirmationsController < Devise::ConfirmationsController
-<<<<<<< HEAD
  prepend ::EE::ConfirmationsController
-=======
+
  include AcceptsPendingInvitations
->>>>>>> upstream/master

  def almost_there
    flash[:notice] = nil