From bdfb16dfaa81ff78492226d98159e57e64daf49d Mon Sep 17 00:00:00 2001 From: aztec-bot Date: Tue, 21 Jul 2026 17:16:52 +0000 Subject: [PATCH] resolve conflicts: forward-port #24561 --- docs/docs-developers/docs/resources/migration_notes.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/docs-developers/docs/resources/migration_notes.md b/docs/docs-developers/docs/resources/migration_notes.md index 7899e10cb01c..dbb29701e344 100644 --- a/docs/docs-developers/docs/resources/migration_notes.md +++ b/docs/docs-developers/docs/resources/migration_notes.md @@ -9,7 +9,6 @@ Aztec is in active development. Each version may introduce breaking changes that ## TBD -<<<<<<< HEAD ## 5.0.1 ### [Aztec.nr] History note nullification helpers renamed and restricted to own-contract notes @@ -55,8 +54,6 @@ The persisted tagging stores now key every entry by the self-describing `: **Impact**: On upgrade your local PXE state is reset. You must re-register accounts and re-sync from genesis. Wallets should surface a "your local state was reset, please re-register accounts and re-sync" path. -======= ->>>>>>> 6dd127124d (fix(txe): align tagging strategy oracle with PXE (#24561)) ### [Aztec.nr] `TestEnvironmentOptions::with_tagging_secret_strategy` replaced `TestEnvironmentOptions::with_tagging_secret_strategy` is now `with_default_tag_secret_strategy_all_modes` for tests