From 226aee7ba1f301e65d3337d351e30cbb87240c13 Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:42:34 +0200
Subject: [PATCH] fix CL

---
 CHANGELOG.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eb24c26..7d91f8d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,12 +20,9 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Patch
 
-<<<<<<< HEAD
-- Changed wording on the data offer creation page
-- Data Offer details now display the contract ID for each contract offer
 - Used createDataOffer endpoint to create an asset, policies and a contract
   definition in a single call
-=======
+
 ### Deployment Migration Notes
 
 _No special deployment migration steps required_
@@ -42,17 +39,22 @@ Various bugfixes.
 
 #### Patch
 
-- Changed wording on the data offer creation page ([#817](https://github.com/sovity/edc-ui/issues/795))
-- Data Offer details now display the contract ID for each contract offer ([#795](https://github.com/sovity/edc-ui/issues/795))
-- Warn the user when using an invalid Policy Id ([#746](https://github.com/sovity/edc-ui/issues/746))
-- Warn the user when using an invalid Data Offer Id ([#745](https://github.com/sovity/edc-ui/issues/745))
+- Changed wording on the data offer creation page
+  ([#817](https://github.com/sovity/edc-ui/issues/795))
+- Data Offer details now display the contract ID for each contract offer
+  ([#795](https://github.com/sovity/edc-ui/issues/795))
+- Warn the user when using an invalid Policy Id
+  ([#746](https://github.com/sovity/edc-ui/issues/746))
+- Warn the user when using an invalid Data Offer Id
+  ([#745](https://github.com/sovity/edc-ui/issues/745))
 - Fixed time restriction upper bound "local day to datetime" conversion issues
   ([#815](https://github.com/sovity/edc-ui/issues/815))
 
 ### Deployment Migration Notes
 
 _No special deployment migration steps required_
->>>>>>> origin/main
+
+> > > > > > > origin/main
 
 ## [v4.1.3] - 2024-09-03