Permalink
Browse files

Merge branch 'dev-master' of github.com:yui/yui3 into dev-master

Conflicts:
	src/io/tests/unit/modules.js
  • Loading branch information...
2 parents 8df32db + 5dc6fcd commit d0db5dbfc0ed49b92805cc1b22d3e5b4d5c57367 @ericf ericf committed Jan 3, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/io/tests/unit/modules.js
@@ -48,7 +48,8 @@ var testModules = {
if (typeof exports !== 'undefined') {
module.exports = testModules;
- // Remove non Nodejs Tests
+ //Remove non-Node.js Tests
delete testModules['transport-tests'];
+ delete testModules['serialize-tests'];
delete testModules['xdr-tests'];
}

0 comments on commit d0db5db

Please sign in to comment.