Commit c79d06ce authored by Stan Hu's avatar Stan Hu

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

parent 214b6b25
class Projects::ApplicationController < ApplicationController class Projects::ApplicationController < ApplicationController
<<<<<<< HEAD
prepend EE::Projects::ApplicationController prepend EE::Projects::ApplicationController
=======
include CookiesHelper include CookiesHelper
>>>>>>> upstream/master
include RoutableActions include RoutableActions
include ChecksCollaboration include ChecksCollaboration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment