Resolve conflict in app/controllers/projects_controller.rb

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

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]