Skip to content

G
gitlab-ce
Commit 74196779 authored by Yorick Peterse's avatar Yorick Peterse
Browse files
Options

Resolved SnippetsFinder spec conflicts

parent d1bb75bb
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/finders/snippets_finder_spec.rb
View file @ 74196779
...@@ -171,7 +171,6 @@ describe SnippetsFinder do ...@@ -171,7 +171,6 @@ describe SnippetsFinder do
expect(snippets).to include(@snippet1, @snippet2, @snippet3) expect(snippets).to include(@snippet1, @snippet2, @snippet3)
end end
<<<<<<< HEAD
it "returns all snippets for auditor users" do it "returns all snippets for auditor users" do
user = create(:user, :auditor) user = create(:user, :auditor)
...@@ -180,8 +179,6 @@ describe SnippetsFinder do ...@@ -180,8 +179,6 @@ describe SnippetsFinder do
expect(snippets).to include(@snippet1, @snippet2, @snippet3) expect(snippets).to include(@snippet1, @snippet2, @snippet3)
end end
=======
>>>>>>> upstream/master
end end
describe '#execute' do describe '#execute' do
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7