Resolve app/controllers/registrations_controller.rb

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

Showing with 2 additions and 6 deletions

app/controllers/registrations_controller.rb app/controllers/registrations_controller.rb +2 -6

No files found.
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
 class RegistrationsController < Devise::RegistrationsController
  include Recaptcha::Verify
-<<<<<<< HEAD
-  prepend EE::RegistrationsController
-
-  before_action :whitelist_query_limiting, only: [:destroy]
-=======
  include AcceptsPendingInvitations
->>>>>>> upstream/master
+
+  prepend EE::RegistrationsController

  before_action :whitelist_query_limiting, only: [:destroy]