Permalink
Browse files

Fix merge conflict.

  • Loading branch information...
2 parents 28b2bb3 + 63a162b commit a16bc458ea5eb085b8b12f6e011396502c234a5a @cliffano committed Jul 28, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/db.js
View
@@ -82,6 +82,7 @@ Db.prototype.paginate = function (interval, startKey, endKey, pageSize, pageCb,
* Bulk update an array of documents.
*
* @param {Array} docs: documents to be bulk updated
+ * @param {Function} cb: standard cb(err, result) callback
*/
Db.prototype.update = function (docs, cb) {

0 comments on commit a16bc45

Please sign in to comment.