Fix conflicts

2016-08-24 16:08:34 -04:00 · 2016-08-24 16:08:34 -04:00 · 0edd3e0935
parent 88b4a7e034 6c1618b14e
commit 0edd3e0935
1 changed files with 1 additions and 1 deletions
--- a/test/user.test.js
+++ b/test/user.test.js
@ -1808,7 +1808,7 @@ describe('User', function() {
      });
    });
  });
-  });
+});

  describe('ctor', function() {
    it('exports default Email model', function() {