Fix diverging conflicts, not sure how this happened but it did

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Constants.java

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index ed762f0b66b6ce26859db710f8297519083c0367..4878ffa72a905acdfe9212fa0afddfb0860f797c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -13,13 +13,13 @@ public class Constants {
   }
 
   public static class DriveTrain {
-    // Drivetrain specific ports
+    // Drivetrain Motor Related Ports
     public static final int FRONT_LEFT = 0;
     public static final int FRONT_RIGHT = 0;
     public static final int REAR_LEFT = 0;
     public static final int REAR_RIGHT = 0;
 
-    // Encoder Specific Ports
+    // Encoder related ports
     public final static int ENCODER_LEFT_A = 3;
     public final static int ENCODER_LEFT_B = 4;
     public final static int ENCODER_RIGHT_A = 2;