Closed Kylogias closed 3 years ago
Apparently it didn't merge into my previous PR and it won't let me merge from upstream in my fork until I resolve this
WHY THE CRAP ARE THERE CONFLICTS IT IS LITERALLY JUST AN IDENTICAL VALUE CHANGE IN TWO FILES THAT ARE COMPLETELY THE SAME OTHERWISE
Apparently it didn't merge into my previous PR and it won't let me merge from upstream in my fork until I resolve this