Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Conversation

@lhmcgann
Copy link
Contributor

No description provided.

# Conflicts:
#	Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
https://github.com/DeepBlueRobotics/RobotCode2018.git into
up-to-date-synced-master-no-local-changes

Conflicts:
	Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java
	Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/RunScript.java
@lhmcgann
Copy link
Contributor Author

@lhmcgann lhmcgann merged commit 97d96f8 into DeepBlueRobotics:master Mar 11, 2018
@lhmcgann lhmcgann deleted the change-motors-to-brake-mode branch March 11, 2018 19:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant