public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-08-25 04:47:06 +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/InteractiveConflictResolving/ConflictResolveModal.ts
+5 -5
View File
@@ -1,9 +1,9 @@
import { App, Modal } from "../../../deps.ts";
import { App, Modal } from "@/deps.ts";
import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT } from "diff-match-patch";
import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "../../../lib/src/common/types.ts";
import { delay } from "../../../lib/src/common/utils.ts";
import { eventHub } from "../../../common/events.ts";
import { globalSlipBoard } from "../../../lib/src/bureau/bureau.ts";
import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "@lib/common/types.ts";
import { delay } from "@lib/common/utils.ts";
import { eventHub } from "@/common/events.ts";
import { globalSlipBoard } from "@lib/bureau/bureau.ts";
export type MergeDialogResult = typeof CANCELLED | typeof LEAVE_TO_SUBSEQUENT | string;