mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-27 11:46:51 -06:00
aiongg
65a6a0ba7e
Conflict: crates/engine/src/cmd/style.rs: both params notes in the paragraph style edit spec (startAt null, kinsoku null); create_para with next's set_json_over, continue_numbering and the branch's explicit_default_kinsoku; edit_para calls both helpers; both tests Conflict: crates/ui-egui/src/dialogs.rs: next's section arms (advanced to bullets) and the branch's CJK section arm; next's paragraph helpers and paragraph_local before the branch's section_list (cjk flag, scrolling list; doc comment stays removed as on next) The branch's "Lines:" row in the shared i18n table is dropped: next already has the key (drop caps).