Resolved SnippetsFinder spec conflicts

74196779 · Yorick Peterse · d1bb75bb · 74196779
Commit 74196779 authored Nov 07, 2018 by Yorick Peterse
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/finders/snippets_finder_spec.rb spec/finders/snippets_finder_spec.rb +0 -3

No files found.
--- a/spec/finders/snippets_finder_spec.rb
+++ b/spec/finders/snippets_finder_spec.rb
@@ -171,7 +171,6 @@ describe SnippetsFinder do

      expect(snippets).to include(@snippet1, @snippet2, @snippet3)
    end
-<<<<<<< HEAD

    it "returns all snippets for auditor users" do
      user = create(:user, :auditor)
@@ -180,8 +179,6 @@ describe SnippetsFinder do

      expect(snippets).to include(@snippet1, @snippet2, @snippet3)
    end
-=======
->>>>>>> upstream/master
  end

  describe '#execute' do