Fix merging issue

loopbackio · Jan 21, 2015 · 8938255 · 8938255
1 parent 1e254b2
commit 8938255
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/postgresql.test.js b/test/postgresql.test.js
@@ -63,7 +63,6 @@ describe('postgresql connector', function () {
     });
   });
 
-<<<<<<< HEAD
   it('should return the model instance for upsert', function(done) {
     Post.upsert({id: post.id, title: 'T2_new', content: 'C2_new',
       approved: true}, function(err, p) {