Resolve conflict in post_receive.rb

8d0471c6 · Douwe Maan · 8cd21552 · 8d0471c6
Commit 8d0471c6 authored Dec 06, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/workers/post_receive.rb app/workers/post_receive.rb +0 -3

No files found.
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
 class PostReceive
  include ApplicationWorker
-<<<<<<< HEAD
  prepend EE::PostReceive
-=======
->>>>>>> upstream/master
  def perform(gl_repository, identifier, changes)
    project, is_wiki = Gitlab::GlRepository.parse(gl_repository)