Skip to content

Commit

Permalink
Merge b6a44d5 into c92707f
Browse files Browse the repository at this point in the history
  • Loading branch information
GavinDmello committed Jan 5, 2019
2 parents c92707f + b6a44d5 commit 2607c04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions aedes.js
Expand Up @@ -12,7 +12,6 @@ var Packet = require('aedes-packet')
var bulk = require('bulk-write-stream')
var reusify = require('reusify')
var Client = require('./lib/client')
var xtend = require('xtend')

module.exports = Aedes

Expand All @@ -34,7 +33,7 @@ function Aedes (opts) {
return new Aedes(opts)
}

opts = xtend(defaultOptions, opts)
opts = Object.assign({}, defaultOptions, opts)

this.id = opts.id || shortid()
this.counter = 0
Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -72,7 +72,6 @@
"reusify": "^1.0.4",
"shortid": "^2.2.14",
"through2": "^3.0.0",
"uuid": "^3.3.2",
"xtend": "^4.0.1"
"uuid": "^3.3.2"
}
}

0 comments on commit 2607c04

Please sign in to comment.