Fix merged schema test
This commit is contained in:
parent
4943feb230
commit
67d186e26c
|
@ -1,11 +1,7 @@
|
||||||
var db = getSchema(), slave = getSchema(), Model, SlaveModel;
|
var db = getSchema(), slave = getSchema(), Model, SlaveModel;
|
||||||
var should = require('should');
|
var should = require('should');
|
||||||
|
|
||||||
<<<<<<< HEAD
|
describe('schema', function() {
|
||||||
describe.skip('schema', function() {
|
|
||||||
=======
|
|
||||||
describe.only('schema', function() {
|
|
||||||
>>>>>>> feature-transactions
|
|
||||||
|
|
||||||
it('should define Model', function() {
|
it('should define Model', function() {
|
||||||
Model = db.define('Model');
|
Model = db.define('Model');
|
||||||
|
|
Loading…
Reference in New Issue