Fix conflicts in `app/controllers/concerns/internal_redirect.rb`

b37fb190 · Bob Van Landuyt · 469d16f4 · b37fb190
Commit b37fb190 authored May 04, 2018 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/concerns/internal_redirect.rb app/controllers/concerns/internal_redirect.rb +0 -3

No files found.
--- a/app/controllers/concerns/internal_redirect.rb
+++ b/app/controllers/concerns/internal_redirect.rb
 module InternalRedirect
-<<<<<<< HEAD
  prepend EE::InternalRedirect
-=======
->>>>>>> upstream/master
  extend ActiveSupport::Concern

  def safe_redirect_path(path)