Merge pull request #4873 from NotHyper-474/patch-1

Remove leftover from merge-conflict in CHANGELOG
2025-04-28 17:59:02 -04:00
parent 19b1c32124 7f5b4974c3
commit 8f2a8c8335
1 changed files with 0 additions and 4 deletions
@@ -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)