models/change: fix typo

2014-07-15 09:14:54 +02:00 · 2014-07-15 09:14:54 +02:00 · 087c602669
parent 555d48f4e0
commit 087c602669
1 changed files with 1 additions and 1 deletions
--- a/lib/models/change.js
+++ b/lib/models/change.js
@ -609,7 +609,7 @@ Conflict.prototype.changes = function(cb) {
 Conflict.prototype.resolve = function(cb) {
  var conflict = this;
  conflict.changes(function(err, sourceChange, targetChange) {
-    if(err) return callback(err);
+    if(err) return cb(err);
    sourceChange.prev = targetChange.rev;
    sourceChange.save(cb);
  });