From 0fbe7b3d25e261edd39ddd9a2da0cefa9ab7f19f Mon Sep 17 00:00:00 2001
From: cadowtin <chasdowtin@gmail.com>
Date: Mon, 9 Sep 2024 23:28:04 -0500
Subject: [PATCH] fix

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4744cb7..032186a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,11 +28,7 @@
 
 # [12.4.5](https://github.com/ChasarooniZ/pf2e-rpg-numbers/compare/12.4.4...12.4.5) - Updated dependencies
 
-<<<<<<< HEAD
 -   Updated recommended dependencies for rerelease of animated spell fx cartoon
-=======
-- Updated recommended dependencies for rerelease of aniamted spell fx cartooon
->>>>>>> 4774207c37169a690255f9f3887801f43dfa4fd9
 
 # [12.4.4](https://github.com/ChasarooniZ/pf2e-rpg-numbers/compare/12.4.3...12.4.4) - Finishers Return