mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-04 11:44:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #285 from pcottle/fixNpmInstall

Browse source 
Resolves #280 stricter version of backbone
This commit is contained in:
Peter Cottle 2015-06-02 22:56:17 -07:00
commit 1e213b9ea0
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -29,7 +29,7 @@
"react-tools": "^0.13.1" "react-tools": "^0.13.1"
}, },
"dependencies": { "dependencies": {
"backbone": "^1.1.2", "backbone": "~1.1.2",
"events": "^1.0.2", "events": "^1.0.2",
"flux": "^2.0.1", "flux": "^2.0.1",
"jquery": "~1.7.3", "jquery": "~1.7.3",

2
src/js/__tests__/base.js
View file

@ -84,7 +84,7 @@ var expectTreeAsync = function(command, expectedJSON, startJSON) {
console.log(JSON.stringify(getHeadlessSummary(headless))); console.log(JSON.stringify(getHeadlessSummary(headless)));
} }
return compareAnswer(headless, expectedJSON); return compareAnswer(headless, expectedJSON);
}, 'trees should be equal', 100); }, 'trees should be equal', 400);
}; };
var expectLevelSolved = function(levelBlob) { var expectLevelSolved = function(levelBlob) {