Fixed test

1007791a · Francisco Lopez · e262d9f2 · 1007791a
Commit 1007791a authored Dec 04, 2017 by Francisco Lopez
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/services/projects/count_service_spec.rb spec/services/projects/count_service_spec.rb +0 -4

No files found.
--- a/spec/services/projects/count_service_spec.rb
+++ b/spec/services/projects/count_service_spec.rb
@@ -6,10 +6,6 @@ describe Projects::CountService do
  describe '.query' do
    it 'raises NotImplementedError' do
-<<<<<<< HEAD
-      expect { service.relation_for_count }.to raise_error(NotImplementedError)
-=======
->>>>>>> upstream/master
      expect { described_class.query(project.id) }.to raise_error(NotImplementedError)
    end
  end