From e3d55b692b37a07c4207d3208c0e38194fefa692 Mon Sep 17 00:00:00 2001
From: steven2308 <steven2308@outlook.com>
Date: Wed, 8 Jan 2025 09:35:27 -0500
Subject: [PATCH] Updates changelog.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ef99bd..5aaa4d14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-<<<<<<< HEAD
-=======
 ## [2.5.6] - 2024-06-17
 
 ### Added
@@ -26,7 +24,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
   - getAssetMetadata core implementation can now return the metadata disregarding tokenId by setting it to 0.
 
->>>>>>> dev
 ## [2.5.3] - 2024-03-19
 
 ### Changed