From 7f5b4974c32c8f8203bee62360994b500520f4cf Mon Sep 17 00:00:00 2001
From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
Date: Mon, 28 Apr 2025 18:30:39 -0300
Subject: [PATCH] Update CHANGELOG.md

Remove left-over from merge conflict.
---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14c3d7f5b..b9dc44aa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,10 +83,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-||||||| 68e9daff
-- Additional shader fix for Stress Pico crashing at the end (was the same issue as Senpai Pico shader error, just in a different shaderfile)
-=======
->>>>>>> public/develop
 - Additional shader fix for Stress (Pico Mix) crashing at the end (was the same issue as Senpai Pico shader error, just in a different shaderfile)