keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merge fix

This commit is contained in:
Antelle 2015-12-12 18:56:16 +03:00
parent 2ee7be3578
commit 9c117204ce
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/models/file-model.js
View File

@ -170,16 +170,15 @@ var FileModel = Backbone.Model.extend({
if (this.get('modified')) {
try {
this.db.merge(remoteDb);
this.set('dirty', true);
this.reload();
} catch (e) {
logger.error('File merge error', e);
return callback(e);
}
} else {
this.db = remoteDb;
this.reload();
}
this.set('dirty', true);
this.reload();
}
callback(err);
}).bind(this));