Resolution for All of the Commit Conflicts

psforever / PSF-LoginServer

Emulated PlanetSide 1 world and login server by the PSForever project.

https://psforever.net

GNU General Public License v3.0

75 stars 46 forks source link

Resolution for All of the Commit Conflicts #1178

Closed Fate-JH closed 6 months ago

Fate-JH commented 6 months ago

I didn't know what to do about the previous merge conflict so I decided to resolve it outside of the web editor. It never even complained about the part that I am fixing.