projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input correct constructor
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
subsystems
/
DriveTrain.java
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 62edcd1d9ad9530566e555762c7d4b885b98020f..633b12b4f78298ff07c348f08837ccf55010b9a7 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@
-95,13
+95,10
@@
public class DriveTrain extends Subsystem {
return this.driveController;
}
return this.driveController;
}
-<<<<<<< HEAD
public PIDController getGyroController() {
return this.gyroController;
}
public PIDController getGyroController() {
return this.gyroController;
}
-=======
->>>>>>> move pidcontroller into drivetrain
public static DriveTrain getDriveTrain() {
if (driveTrain == null) {
driveTrain = new DriveTrain();
public static DriveTrain getDriveTrain() {
if (driveTrain == null) {
driveTrain = new DriveTrain();