Resolve conflicts in app/controllers/projects/lfs_api_controller.rb

17fd11e9 · Stan Hu · 4f57d821 · 17fd11e9
Commit 17fd11e9 authored Jul 31, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -4,11 +4,8 @@ class Projects::LfsApiController < Projects::GitHttpClientController
  include GitlabRoutingHelper
  include LfsRequest

-<<<<<<< HEAD
  prepend ::EE::Projects::LfsApiController

-=======
->>>>>>> upstream/master
  LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze

  skip_before_action :lfs_check_access!, only: [:deprecated]