From d3437974e494d540911e47f50f7b8f8cdb70d32b Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Thu, 15 Dec 2022 06:40:44 -0600
Subject: [PATCH] Correct changelog

---
 CHANGELOG.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e8ee18..0930358 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-=======
-## [1.3.3] - 2022-12-13
-
 ### Added
 
 - Support for Woocomerce - 
@@ -17,7 +13,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [1.3.2] - 2022-10-11
 
->>>>>>> cc881b38a1b0a1fd35863650da445e6179f192bf
 ### Added
 
 - New component added to export orders in CSV format. Allows users to download orders.