fixed merge errors

nrstott · Nov 2, 2011 · be66aea · be66aea
1 parent 38dd559
commit be66aea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     	"jsgi": ">=v0.2.2",
     	"mustache": "0.3.1-dev",
       "deflate": ">=1.0.3",
-      "node-uuid": ">=1.2.0"
+      "node-uuid": ">=1.2.0",
       "parted": "=0.0.7",
       "q": "=0.7.2"
     },

diff --git a/test/middleware.test.js b/test/middleware.test.js
@@ -2,7 +2,7 @@ var bogart    = require('../lib/bogart')
   , Q         = require("promised-io/lib/promise")
   , assert    = require('assert')
   , path      = require('path')
-  , fs     = require('fs'),
+  , fs     = require('fs')
   , security  = require("../lib/security");
 
 exports["test parses JSON"] = function(beforeExit) {