Remove force_merge flag
This commit is contained in:
parent
bd8650e80b
commit
ea5a123cb8
1 changed files with 33 additions and 50 deletions
|
|
@ -369,9 +369,7 @@ export class SyncClient {
|
|||
this.checkIfDestroyed("syncLocallyCreatedFile");
|
||||
|
||||
this.fileChangeNotifier.notifyOfFileChange(relativePath);
|
||||
return this.syncer.syncLocallyCreatedFile(relativePath, {
|
||||
forceMerge: false
|
||||
});
|
||||
return this.syncer.syncLocallyCreatedFile(relativePath,);
|
||||
}
|
||||
|
||||
public async syncLocallyDeletedFile(
|
||||
|
|
|
|||
Loading…
Reference in a new issue