public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-05-24 00:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

- New feature:

Browse Source 
- If any conflicted files have been left, they will be reported.
- Fixed:
  - Now the name of the conflicting file is shown on the conflict-resolving dialogue.
  - Hidden files are now able to be merged again.
  - No longer error caused at plug-in being loaded.
- Improved:
  - Caching chunks are now limited in total size of cached chunks.
This commit is contained in:
vorotamoroz
2023-02-17 17:35:06 +09:00
parent b24c4ef55b
commit be3d61c1c7
4 changed files with 68 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ConflictResolveModal.ts
View File

@@ -22,7 +22,7 @@ export class ConflictResolveModal extends Modal {
contentEl.empty();
contentEl.createEl("h2", { text: "This document has conflicted changes." });
contentEl.createEl("span", this.filename);
contentEl.createEl("span", { text: this.filename });
const div = contentEl.createDiv("");
div.addClass("op-scrollable");
let diff = "";