Resolve merge conflicts

2026-03-06 12:31:33 +01:00 · 2017-02-18 19:14:39 -07:00
parent b227297ef3 1b43faba1a
commit 23540afaeb
7 changed files with 193 additions and 172 deletions
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,2 @@
 --reporter dot
--timeout 15000
+--timeout 25000
--- a/test/user.js
+++ b/test/user.js