From 698773db52665d5e8fe01dbdfae54348c96a0eb2 Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Thu, 9 Mar 2023 17:46:30 +0100 Subject: [PATCH] chore: fix conflict --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 583f93a..13a4380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ - <a name="v1.13.2"></a> ## [v1.13.2] - 2022-12-23 @@ -156,8 +155,12 @@ <a name="v1.0.0"></a> ## v1.0.0 - 2022-10-04 +<<<<<<< HEAD [v1.13.2]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.1...v1.13.2 [v1.13.1]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.0...v1.13.1 +======= +[v1.14.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.0...v1.14.0 +>>>>>>> d4109b1 (Update changelog) [v1.13.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.12.0...v1.13.0 [v1.12.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.11.0...v1.12.0 [v1.11.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.10.2...v1.11.0 -- GitLab