From a2f31c86a00e2f529acd122feb41752a32fd3dc5 Mon Sep 17 00:00:00 2001 From: Minu Mathew Date: Wed, 18 May 2022 13:29:14 -0500 Subject: [PATCH] resolved merge conflicts --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a097373..6fbe2ef8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -<<<<<<< HEAD ## [1.14.0] - 2022-05-17 ### Added - Sending email to reviewers. [#839](https://github.com/rokwire/rokwire-building-blocks-api/issues/839) @@ -37,8 +36,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Contributor editing for person and organization. [#888](https://github.com/rokwire/rokwire-building-blocks-api/issues/888) - Fix the Jinja version. [#893](https://github.com/rokwire/rokwire-building-blocks-api/issues/893) -======= ->>>>>>> 7c09b3db20f8c178e64126f47872eafede916606 ## [1.13.0] - 2022-04-04 ### Fixed - UI changes to 'Source Repo URL' field in catalog. [#814](https://github.com/rokwire/rokwire-building-blocks-api/issues/814)