From 087c602669740f968c544410f669065b556c4c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= <miroslav@strongloop.com>
Date: Tue, 15 Jul 2014 09:14:54 +0200
Subject: [PATCH] models/change: fix typo

---
 lib/models/change.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/change.js b/lib/models/change.js
index e66a8453..9f291fdd 100644
--- 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);
   });