Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

ArushCode#2

Open
zerozerodone wants to merge 24 commits into
mainfrom
ArushCode
Open

ArushCode#2
zerozerodone wants to merge 24 commits into
mainfrom
ArushCode

Conversation

@zerozerodone

Copy link
Copy Markdown

Working auto code

zerozerodone and others added 24 commits February 3, 2021 12:53
# Conflicts:
#	FtcRobotController/build/generated/source/buildConfig/debug/com/qualcomm/ftcrobotcontroller/BuildConfig.java
#	FtcRobotController/build/intermediates/compile_library_classes_jar/debug/classes.jar
#	FtcRobotController/build/intermediates/javac/debug/classes/com/qualcomm/ftcrobotcontroller/BuildConfig.class
#	FtcRobotController/build/intermediates/javac/debug/classes/org/firstinspires/ftc/robotcontroller/internal/FtcRobotControllerActivity.class
#	FtcRobotController/build/intermediates/runtime_library_classes_jar/debug/classes.jar
#	TeamCode/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex
#	TeamCode/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex
#	TeamCode/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	TeamCode/build/outputs/apk/debug/TeamCode-debug.apk
# Conflicts:
#	FtcRobotController/build/generated/source/buildConfig/debug/com/qualcomm/ftcrobotcontroller/BuildConfig.java
#	FtcRobotController/build/intermediates/compile_library_classes_jar/debug/classes.jar
#	FtcRobotController/build/intermediates/javac/debug/classes/com/qualcomm/ftcrobotcontroller/BuildConfig.class
#	FtcRobotController/build/intermediates/javac/debug/classes/org/firstinspires/ftc/robotcontroller/internal/FtcRobotControllerActivity.class
#	FtcRobotController/build/intermediates/runtime_library_classes_jar/debug/classes.jar
#	TeamCode/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex
#	TeamCode/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	TeamCode/build/outputs/apk/debug/TeamCode-debug.apk
…est times for shooter prep in auto code (test version).
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