Fix conflicts in app/controllers/projects/application_controller.rb

c79d06ce · Stan Hu · 214b6b25 · c79d06ce
Commit c79d06ce authored Sep 04, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/projects/application_controller.rb app/controllers/projects/application_controller.rb +0 -3

No files found.
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
 class Projects::ApplicationController < ApplicationController
-<<<<<<< HEAD
  prepend EE::Projects::ApplicationController
-=======
  include CookiesHelper
->>>>>>> upstream/master
  include RoutableActions
  include ChecksCollaboration