| commit | 606fd69a4b5dccc50c3b5fba9e0bf44458e81702 | [log] [tgz] |
|---|---|---|
| author | Brian Silverman <brians> | Fri Mar 29 22:56:03 2013 -0700 |
| committer | Brian Silverman <brians> | Sat Mar 30 16:35:13 2013 -0700 |
| tree | 0e7f5dbaee83152062d57975b2a2128666929f4e | |
| parent | 8d19fbb254326dd8742e517adf04353c47e2a694 [diff] |
another stupid merge fix THIS NEEDS TO DISAPPEAR
diff --git a/frc971/atom_code/atom_code.gyp b/frc971/atom_code/atom_code.gyp index 606f2e6..710a5d4 100644 --- a/frc971/atom_code/atom_code.gyp +++ b/frc971/atom_code/atom_code.gyp
@@ -20,7 +20,6 @@ '../input/input.gyp:JoystickReader', '../input/input.gyp:sensor_receiver', '../input/input.gyp:GyroReader', - '../input/input.gyp:AutoMode', #'../input/input.gyp:AutoMode', '../../vision/vision.gyp:OpenCVWorkTask', '../../vision/vision.gyp:GoalMaster',