Merge branch 'master' of git@github.com:harish2704/simple-mocha.git

Conflicts:
	index.js
This commit is contained in:
2015-09-08 12:58:30 +05:30
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
/* Don't do anything if we are in Mocha's environment */ /* Don't do anything if we are in Mocha's environment */
if( global.describe ){ return; } // if( global.describe ){ return; }
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "simple-mocha", "name": "simple-mocha",
"version": "0.0.1", "version": "0.0.4",
"description": "Simple stupid implementation of Mocha test runner. Tests can be run directly within node as any Nodejs code.", "description": "Simple stupid implementation of Mocha test runner. Tests can be run directly within node as any Nodejs code.",
"author": "Harish.K<harish2704@gmail.com>", "author": "Harish.K<harish2704@gmail.com>",
"license": "MIT", "license": "MIT",