Resolve conflict in app/controllers/projects_controller.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/controllers/projects_controller.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
86ba6492 · Rémy Coutable · 9a0eda66 · 86ba6492
Commit 86ba6492 authored Oct 11, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/controllers/projects_controller.rb app/controllers/projects_controller.rb +1 -4

No files found.
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
 class ProjectsController < Projects::ApplicationController
  include IssuableCollections
  include ExtractsPath
-<<<<<<< HEAD
-  prepend EE::ProjectsController
-=======
  include PreviewMarkdown
->>>>>>> upstream/master
+  prepend EE::ProjectsController
  before_action :authenticate_user!, except: [:index, :show, :activity, :refs]
  before_action :project, except: [:index, :new, :create]