From 5c0af5364dbff8f04e37c79a496b62d4aed8d233 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Tue, 12 Jul 2022 20:36:13 +0300 Subject: [PATCH] docs: fix bad merge Signed-off-by: Alexander Tkachev --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61fbb9a..7cd9ae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,11 +156,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#160]: https://github.com/cloudevents/sdk-python/pull/160 [#165]: https://github.com/cloudevents/sdk-python/pull/165 [#167]: https://github.com/cloudevents/sdk-python/pull/167 -<<<<<<< master -[#167]: https://github.com/cloudevents/sdk-python/pull/167 -[#172]: https://github.com/cloudevents/sdk-python/pull/172 -======= [#168]: https://github.com/cloudevents/sdk-python/pull/168 [#169]: https://github.com/cloudevents/sdk-python/pull/169 [#170]: https://github.com/cloudevents/sdk-python/pull/170 ->>>>>>> master +[#172]: https://github.com/cloudevents/sdk-python/pull/172 +