Resolve conflicts in app/controllers/projects_controller.rb

00fb56cb · Stan Hu · 02607354 · 00fb56cb
Commit 00fb56cb authored Jul 07, 2018 by Stan Hu
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
@@ -2,11 +2,8 @@ class ProjectsController < Projects::ApplicationController
  include IssuableCollections
  include ExtractsPath
  include PreviewMarkdown
-<<<<<<< HEAD
-  prepend EE::ProjectsController
-=======
->>>>>>> upstream/master
  include SendFileUpload
+  prepend EE::ProjectsController

  before_action :whitelist_query_limiting, only: [:create]
  before_action :authenticate_user!, except: [:index, :show, :activity, :refs]