github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-12 02:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1716 from sharelatex:bg-fix-merge-conflict

Browse source 
fix incorrect merge conflict

GitOrigin-RevId: 55e19f025a433e8abbde16bd68ccbc3e21f7964f
This commit is contained in:
Brian Gough 2019-04-16 10:52:56 +01:00 committed by sharelatex
parent 5864e90794
commit 1078688895
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/public/js/libs/sharejs.js
View file

@ -1311,7 +1311,7 @@ define(['ace/ace','libs/sha1'], function () {
// console.log "SENDING OP TO SERVER", @inflightOp, @version
var lastVersion = this.__lastVersion;
this.__lastVersion = this.version;
return this.connection.send({ doc: this.name, op: this.inflightOp, v: this.version, lastV: lastVersion, hash: this.inflightOp.sha1});
return this.connection.send({ doc: this.name, op: this.inflightOp, v: this.version, lastV: lastVersion, hash: sha1});
}
// Submit an op to the server. The op maybe held for a little while before being sent, as only one