From 1350d2e2d3202ceff65fd28f9546e5ff732d1ba8 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 16 Jun 2015 14:36:48 -0700 Subject: [PATCH 1/2] bump for travis --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1a01cc03..96058ca6 100644 --- a/README.md +++ b/README.md @@ -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). From 64ca3183468e79e3e0999299f3ac8e0a3e7df4d9 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 16 Jun 2015 14:40:11 -0700 Subject: [PATCH 2/2] wait longer --- src/js/__tests__/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/__tests__/base.js b/src/js/__tests__/base.js index 5c8547c8..264595df 100644 --- a/src/js/__tests__/base.js +++ b/src/js/__tests__/base.js @@ -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) {