Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix merged schema test

  • Loading branch information...
commit 67d186e26cb7fe619e4791f13ab38832b7f3f080 1 parent 4943feb
@1602 authored
Showing with 1 addition and 5 deletions.
  1. +1 −5 test/schema.test.js
View
6 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');
Please sign in to comment.
Something went wrong with that request. Please try again.