fix conflicts

cosmos · Oct 18, 2024 · ef14d91 · ef14d91
1 parent d4f4aa2
commit ef14d91
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/.changelog/v21.0.0/dependencies/3385-bump-ics.md b/.changelog/v21.0.0/dependencies/3385-bump-ics.md
diff --git a/.changelog/v21.0.0/state-breaking/3385-bump-ics.md b/.changelog/v21.0.0/state-breaking/3385-bump-ics.md