Resolve app/services/git_tag_push_service.rb

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

app/services/git_tag_push_service.rb

@@ -9,13 +9,8 @@ class GitTagPushService < BaseService
 
     @push_data = build_push_data
 
-<<<<<<< HEAD
-    EventCreateService.new.push(project, current_user, @push_data)
-    Ci::CreatePipelineService.new(project, current_user, @push_data).execute(:push, mirror_update: params[:mirror_update])
-=======
     EventCreateService.new.push(project, current_user, push_data)
-    Ci::CreatePipelineService.new(project, current_user, push_data).execute(:push)
->>>>>>> ce/master
+    Ci::CreatePipelineService.new(project, current_user, push_data).execute(:push, mirror_update: params[:mirror_update])
 
     SystemHooksService.new.execute_hooks(build_system_push_data, :tag_push_hooks)
     project.execute_hooks(push_data.dup, :tag_push_hooks)