Skip to content

Commit

Permalink
Merge 79fe5c7 into 2b9077c
Browse files Browse the repository at this point in the history
  • Loading branch information
marcbachmann committed Nov 23, 2016
2 parents 2b9077c + 79fe5c7 commit 0c30998
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"main": "./lib/index.js",
"dependencies": {
"bluebird": "^3.4.0",
"node-uuid": "^1.4.7",
"pg": "^6.0.0"
"pg": "^6.0.0",
"uuid": "^3.0.0"
},
"devDependencies": {
"babel-cli": "^6.8.0",
Expand Down
2 changes: 1 addition & 1 deletion src/manager.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const EventEmitter = require('events').EventEmitter; //node 0.10 compatibility;
const Promise = require('bluebird');
const uuid = require('node-uuid');
const uuid = require('uuid');

const Db = require('./db');
const Worker = require('./worker');
Expand Down

0 comments on commit 0c30998

Please sign in to comment.