Skip to content

Commit

Permalink
Merge pull request #12 from marcbachmann/update-uuid
Browse files Browse the repository at this point in the history
Update uuid to version 3.0.0
  • Loading branch information
Ben Diamant authored Dec 1, 2016
2 parents 7fcd7a1 + c5d6016 commit ca0f37d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"htmlencode": "0.0.4",
"lodash": "4.11.1",
"moment": "2.13.0",
"node-uuid": "1.4.7",
"request": "^2.69.0"
"request": "^2.69.0",
"uuid": "^3.0.0"
},
"devDependencies": {
"faker": "^3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions test/utils/test.util.js.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

const moment = require('moment');
const crypto = require('crypto');
const uuid = require('node-uuid');
const uuid = require('uuid');
const pxconfig = require('../../lib/pxconfig').conf();


Expand Down Expand Up @@ -154,4 +154,4 @@ function assertLogString(str, logs) {
}

return false;
}
}

0 comments on commit ca0f37d

Please sign in to comment.