fix: fix bad conflict solve

[Cristiandis]

Fixes build issues, this time i tested it, my bad

[oSumAtrIX]

What exactly is the build issue?

[Cristiandis]

What exactly is the build issue?

https://github.com/revenge-mod/revenge-tweak/actions/runs/11863132717

[oSumAtrIX]

Why did this occur https://github.com/revenge-mod/revenge-tweak/actions/runs/11863132717/job/33063956412#step:8:18
and how does the PR fix it? I am seeing big code blocks being removed but no explanation on why

[Cristiandis]

Why did this occur https://github.com/revenge-mod/revenge-tweak/actions/runs/11863132717/job/33063956412#step:8:18

and how does the PR fix it? I am seeing big code blocks being removed but no explanation on why

i didn't fix conflicts correctly in the last pr so i had both the old and new version
i fixed here by looking and upstream and deleting the old part

[Cristiandis]

this is the last upstream rebase i can do due to the licensing changes

[oSumAtrIX]

This PR should only make the changes that are necessary to fix the build issue. Other changes will be made with a separate PR

[Cristiandis]

This PR should only make the changes that are necessary to fix the build issue. Other changes will be made with a separate PR

ok, will do