Commit 37d9b327 authored by Bob Van Landuyt's avatar Bob Van Landuyt

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

parent ebedb7ee
require 'spec_helper' require 'spec_helper'
<<<<<<< HEAD
feature 'Diffs URL', js: true do
=======
feature 'Diffs URL', :js do feature 'Diffs URL', :js do
>>>>>>> ce-com/master
include ProjectForksHelper include ProjectForksHelper
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment