# Conflicts: # crates/catalog/src/journal.rs # crates/catalog/src/lib.rs # crates/catalog/src/local.rs # crates/catalog/src/tests_format_version.rs # crates/catalog/src/tests_journal.rs # crates/ui-egui/src/panels/left.rs # docs/whats-new.md
# Conflicts: # crates/catalog/src/journal.rs # crates/catalog/src/lib.rs # crates/catalog/src/local.rs # crates/catalog/src/tests_format_version.rs # crates/catalog/src/tests_journal.rs # crates/ui-egui/src/panels/left.rs # docs/whats-new.md