fix incomplete merge

mozilla · Dec 18, 2015 · 5b73f99 · 5b73f99
1 parent 7465cb2
commit 5b73f99
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/services/api/handlers/projects.js b/test/services/api/handlers/projects.js
@@ -2190,7 +2190,6 @@ experiment('Project Handlers', function() {
     });
   });
 
-<<<<<<< df512a67d7bb2dbcb5db204bc6f7dc4be45111c4
   experiment('View Counting', function() {
     test('First view can be counted (upsert the new row)', function(done) {
       server.inject(configs.views.firstView, function(resp) {