>> Merge branch 'dbexport' of https://gitlab.com/pitmutt/zgo into dbexport

2022-12-17 19:21:43 -05:00 · 2022-12-17 19:21:43 -05:00 · 04ae91b9b7
commit 04ae91b9b7
parent d66b956773 d3437974e4
1 changed files with 0 additions and 5 deletions
--- 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.