verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

models/change: fix typo

This commit is contained in:
Miroslav Bajtoš 2014-07-15 09:14:54 +02:00
parent 555d48f4e0
commit 087c602669
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/change.js
View File

@ -609,7 +609,7 @@ Conflict.prototype.changes = function(cb) {
Conflict.prototype.resolve = function(cb) { Conflict.prototype.resolve = function(cb) {
var conflict = this; var conflict = this;
conflict.changes(function(err, sourceChange, targetChange) { conflict.changes(function(err, sourceChange, targetChange) {
if(err) return callback(err); if(err) return cb(err);
sourceChange.prev = targetChange.rev; sourceChange.prev = targetChange.rev;
sourceChange.save(cb); sourceChange.save(cb);
}); });