chore(): resolve merge conflicts

This commit is contained in:
Liam DeBeasi
2022-04-13 10:02:38 -04:00
9 changed files with 9 additions and 9 deletions

View File

@ -3,7 +3,7 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [6.1.0](https://github.com/ionic-team/ionic-docs/compare/v6.0.14...v6.1.0) (2022-04-13)
# [6.1.0](https://github.com/ionic-team/ionic-docs/compare/v6.0.16...v6.1.0) (2022-04-13)
**Note:** Version bump only for package @ionic/docs