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

Fix import paths

Browse Source
This commit is contained in:
vorotamoroz
2026-06-17 04:39:39 +01:00
parent dcd10cd690
commit ae9c46f8f0
127 changed files with 634 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/features/ModuleInteractiveConflictResolver.ts
+4 -4
View File
@@ -8,13 +8,13 @@ import {
type DocumentID,
type FilePathWithPrefix,
type diff_result,
} from "../../lib/src/common/types.ts";
} from "@lib/common/types.ts";
import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictResolveModal.ts";
import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
import { displayRev } from "../../common/utils.ts";
import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
import { displayRev } from "@/common/utils.ts";
import { fireAndForget } from "octagonal-wheels/promises";
import { serialized } from "octagonal-wheels/concurrency/lock";
import type { LiveSyncCore } from "../../main.ts";
import type { LiveSyncCore } from "@/main.ts";
export class ModuleInteractiveConflictResolver extends AbstractObsidianModule {
_everyOnloadStart(): Promise<boolean> {