Fixed merge conflicts

This commit is contained in:
Robert Beckebans 2025-01-23 14:49:31 +01:00
parent 2997fe9f02
commit af4480f35c

View file

@ -703,8 +703,6 @@ sysEvent_t Sys_GetEvent()
case SDL_JOYDEVICEADDED:
case SDL_JOYDEVICEREMOVED:
case SDL_JOYBATTERYUPDATED:
case SDL_CONTROLLERDEVICEADDED:
case SDL_CONTROLLERDEVICEREMOVED:
// Avoid 'unknown event' spam
continue;