Resolve conflicts in spec/services/projects/update_service_spec.rb

4a5df964 · Bob Van Landuyt · da2645fd · 4a5df964
Commit 4a5df964 authored Oct 10, 2017 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/services/projects/update_service_spec.rb spec/services/projects/update_service_spec.rb +0 -3

No files found.
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
 require 'spec_helper'
 describe Projects::UpdateService, '#execute' do
-<<<<<<< HEAD
  include StubConfiguration
-=======
->>>>>>> ce-com/master
  include ProjectForksHelper
  let(:gitlab_shell) { Gitlab::Shell.new }