Conflicts: app/controllers/groups/application_controller.rb

a5afdebf · Bob Van Landuyt · ea6d4565 · a5afdebf
Commit a5afdebf authored Feb 23, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/controllers/groups/application_controller.rb app/controllers/groups/application_controller.rb +1 -4

No files found.
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
 class Groups::ApplicationController < ApplicationController
-  include RoutableActions
-<<<<<<< HEAD
  prepend EE::Groups::ApplicationController
-=======
->>>>>>> upstream/master
+  include RoutableActions
  include ControllerWithCrossProjectAccessCheck

  layout 'group'