misc: fix merge conflict

2025-06-17 19:22:01 +01:00
parent a6be668328 87fbd6c362
commit 868cba376f
12 changed files with 733 additions and 402 deletions
@@ -10,6 +10,7 @@ path = "src/lib.rs"
 [dependencies]
 common = { path = "../common" }
 assembler = { path = "../assembler" }
+dsa_editor = { path = "../dsa_editor" }
 eframe = "0.31.1"
 egui = "0.31.1"
 rfd = "0.15.3"