Fix merged schema test

2013-04-05 02:14:16 +04:00 · 2013-04-05 02:14:16 +04:00 · 67d186e26c
parent 4943feb230
commit 67d186e26c
1 changed files with 1 additions and 5 deletions
--- a/test/schema.test.js
+++ b/test/schema.test.js
@ -1,11 +1,7 @@
 var db = getSchema(), slave = getSchema(), Model, SlaveModel;
 var should = require('should');

-<<<<<<< HEAD
-describe.skip('schema', function() {
-=======
-describe.only('schema', function() {
->>>>>>> feature-transactions
+describe('schema', function() {

    it('should define Model', function() {
        Model = db.define('Model');