Fix merge of wpilib/pyproject.toml

I accidentally resolved the entire file using "ours".

Author: auscompgeek

subprojects/robotpy-wpilib/pyproject.toml

@@ -156,8 +156,6 @@ MotorController = "frc/motorcontrol/MotorController.h"
 DriverStationModeThread = "frc/internal/DriverStationModeThread.h"
 
 # frc/motorcontrol
-DMC60 = "frc/motorcontrol/DMC60.h"
-Jaguar = "frc/motorcontrol/Jaguar.h"
 Koors40 = "frc/motorcontrol/Koors40.h"
 MotorControllerGroup = "rpy/MotorControllerGroup.h"
 PWMMotorController = "frc/motorcontrol/PWMMotorController.h"
@@ -167,11 +165,9 @@ PWMTalonFX = "frc/motorcontrol/PWMTalonFX.h"
 PWMTalonSRX = "frc/motorcontrol/PWMTalonSRX.h"
 PWMVenom = "frc/motorcontrol/PWMVenom.h"
 PWMVictorSPX = "frc/motorcontrol/PWMVictorSPX.h"
-SD540 = "frc/motorcontrol/SD540.h"
 Spark = "frc/motorcontrol/Spark.h"
 SparkMini = "frc/motorcontrol/SparkMini.h"
 Talon = "frc/motorcontrol/Talon.h"
-Victor = "frc/motorcontrol/Victor.h"
 VictorSP = "frc/motorcontrol/VictorSP.h"
 
 # frc/smartdashboard