summaryrefslogtreecommitdiff
path: root/mocha_test/compose.js
diff options
context:
space:
mode:
authorSteve Robb <softnfuzzyrobb@gmail.com>2016-03-06 18:06:13 +0000
committerSteve Robb <softnfuzzyrobb@gmail.com>2016-03-06 18:06:13 +0000
commit20c0a9be73f517fcb7cda940675007416bb3aa0c (patch)
tree3cd0ca42c3375dd1c61c92ed0f6496631cc2ffad /mocha_test/compose.js
parent0858e09f203f9e358bdfa1ce84400e758bea68fc (diff)
parentf38483cbccc16efe205b0bf1439c233e61a7f090 (diff)
downloadasync-20c0a9be73f517fcb7cda940675007416bb3aa0c.tar.gz
Merge branch 'master' into autoInjectPR
Conflicts: README.md lib/async.js test/test-async.js
Diffstat (limited to 'mocha_test/compose.js')
-rw-r--r--mocha_test/compose.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/mocha_test/compose.js b/mocha_test/compose.js
index 85306a5..5be9192 100644
--- a/mocha_test/compose.js
+++ b/mocha_test/compose.js
@@ -1,4 +1,4 @@
-var async = require('../lib/async');
+var async = require('../lib');
var expect = require('chai').expect;
describe('compose', function(){