Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

we gotta do it eventually... #189

Open
wants to merge 178 commits into
base: master
Choose a base branch
from
Open

we gotta do it eventually... #189

wants to merge 178 commits into from

Conversation

wh1ter0se
Copy link
Owner

No description provided.

brogan20 and others added 30 commits January 20, 2018 12:59
… into develop

Conflicts:
	src/org/usfirst/frc/team3695/robot/auto/CommandGroupAuto.java
	src/org/usfirst/frc/team3695/robot/commands/CyborgCommandDriveDistance.java
	src/org/usfirst/frc/team3695/robot/commands/CyborgCommandRotateDegrees.java
…nto develop

# Conflicts:
#	src/org/usfirst/frc/team3695/robot/auto/CommandGroupAuto.java
#	src/org/usfirst/frc/team3695/robot/commands/CyborgCommandDriveDistance.java
# Conflicts:
#	src/org/usfirst/frc/team3695/robot/commands/CyborgCommandDriveDistance.java
U2FsdGVkX181kHPomOgKjWzs1sLii3uB7/2xdkIphug=
cd	cb	06	d9	c9	9c	a6	18	41	02	8f	bc	e9	12	b1	17
…nto develop

# Conflicts:
#	src/org/usfirst/frc/team3695/robot/commands/CyborgCommandRotateDegrees.java
wh1ter0se and others added 30 commits March 28, 2018 01:55
Blue twilight pulled it off beautifully.
Also the best command
Note to self: When copying from a flashdrive, IntelliJ will not add files to git without user intervention
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants