Resolve conflicts in spec/features/merge_requests/diffs_spec.rb

37d9b327 · Bob Van Landuyt · ebedb7ee · 37d9b327
Commit 37d9b327 authored Oct 10, 2017 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/features/merge_requests/diffs_spec.rb spec/features/merge_requests/diffs_spec.rb +0 -4

No files found.
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
 require 'spec_helper'

-<<<<<<< HEAD
-feature 'Diffs URL', js: true do
-=======
 feature 'Diffs URL', :js do
->>>>>>> ce-com/master
  include ProjectForksHelper

  let(:project) { create(:project, :public, :repository) }