diff --git a/.cookiecutter.json b/.cookiecutter.json index bc0b9ada..21b71ff7 100644 --- a/.cookiecutter.json +++ b/.cookiecutter.json @@ -23,7 +23,11 @@ "pull_request_strategy": "update-or-create", "post_actions": [], "draft": false, +<<<<<<< HEAD "baked_commit_ref": "e4d0e9bd14396e92e7cc2699a9afe91ca5946468", +======= + "baked_commit_ref": "f5117554351af5fa96717c22efbbe12e9b9c95fa", +>>>>>>> 624e611 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) "drift_managed_branch": "develop" } } diff --git a/changes/+main.housekeeping b/changes/+main.housekeeping new file mode 100644 index 00000000..3433adf6 --- /dev/null +++ b/changes/+main.housekeeping @@ -0,0 +1 @@ +Rebaked from the cookie `main`. diff --git a/docs/admin/release_notes/version_1.0.md b/docs/admin/release_notes/version_1.0.md index 63ef2244..b38d492f 100644 --- a/docs/admin/release_notes/version_1.0.md +++ b/docs/admin/release_notes/version_1.0.md @@ -6,7 +6,11 @@ - Commit to SemVer - F5 fixes +<<<<<<< HEAD ## v1.0.0 - 2021-11 +======= +## [v1.0.0] - 2026-08-26 +>>>>>>> 624e611 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) ### Added diff --git a/docs/images/networktocode_logo.svg b/docs/images/networktocode_logo.svg deleted file mode 100644 index 348e5241..00000000 --- a/docs/images/networktocode_logo.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -