Merge branch 'master' into mzJPTranslate4

This commit is contained in:
Mizunashi Mana 2015-06-17 15:25:20 +09:00
commit 396c306fd2
2 changed files with 1 additions and 2 deletions

View file

@ -1,6 +1,5 @@
# LearnGitBranching
[![Build Status](https://travis-ci.org/pcottle/learnGitBranching.svg?branch=master)](https://travis-ci.org/pcottlele/learnGitBranching)
LearnGitBranching is a git repository visualizer, sandbox, and series of educational tutorials and challenges. Its primary purpose is to help developers understand git through the power of visualization (something that's absent when working on the command line).

View file

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