Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[0.0.4] Commit for NPM update. - Small fixes. [FIX]

  • Loading branch information...
commit 7d09340f23b78cef8bf46fb103ca36dbf999be75 1 parent 2ccdc56
louis authored
Showing with 0 additions and 14 deletions.
  1. +0 −4 package.json
  2. +0 −10 test.js
View
4 package.json
@@ -22,11 +22,7 @@
"github"
],
"scripts": {
-<<<<<<< HEAD
"test": "node test.js && test2.js"
-=======
- "test": "node test.js"
->>>>>>> ad8bd3dd86cbd1713554ce3109441f9ad8711ce3
},
"description": "Use gist's from GitHub as database files.",
"engine": "node => 0.6",
View
10 test.js
@@ -1,15 +1,9 @@
/*
-<<<<<<< HEAD
Yes, I realize these tests are super simple and need to be improved.
Test 1, read example database.
*/
console.log("Test 1: print from an example database.");
-=======
- Test 1, read example database.
-*/
-console.log("Test 1: print from an example database.\n");
->>>>>>> ad8bd3dd86cbd1713554ce3109441f9ad8711ce3
var GistDB = require('./');
var gdb = new GistDB({id:'9879133ed9dd415d7199'});
gdb.load();
@@ -32,8 +26,4 @@ function runTest2 () {
gdb.on('loaded',function (data) {
console.log('Current data: '+JSON.stringify(data));
});
-<<<<<<< HEAD
-}
-=======
}
->>>>>>> ad8bd3dd86cbd1713554ce3109441f9ad8711ce3
Please sign in to comment.
Something went wrong with that request. Please try again.