{"push_id":567511099,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"e0a9b19f3e8d23c9f5d36d7b8c9efd295b1cd8a6","before":"45375ed48d4ea0d5af208c4bec12366e68bfb349","commits":[{"sha":"878561019f95a72ba88ad76b0cdb1829a67f63c3","author":{"email":"1f9abbf96fd7d488a689f990a1f56716d85269d4@gmail.com","name":"1982CougarRobotics"},"message":"Changed PickUpTote Command\n\nMade it so now the Pick Up Tote command now moves to the first level,\ndrops the tote it is currently holding on the new tote, move the clamp\nto the floor level, reclamps, and move the lift up.","distinct":true,"url":"https://api.github.com/repos/CougarRobotics1982/Robot2015Code/commits/878561019f95a72ba88ad76b0cdb1829a67f63c3"},{"sha":"e0a9b19f3e8d23c9f5d36d7b8c9efd295b1cd8a6","author":{"email":"1f9abbf96fd7d488a689f990a1f56716d85269d4@gmail.com","name":"1982CougarRobotics"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tDebug/FRCUserProgram\n\tDebug/src/Commands/PickUpTote.o\n\tDebug/src/Commands/ResetEncoderLift.o\n\tDebug/src/Commands/extendPiston.o\n\tDebug/src/OI.o\n\tDebug/src/Robot.o\n\tDebug/src/Subsystems/Clamp.o\n\tDebug/src/Subsystems/DriveTrain.o\n\tDebug/src/Subsystems/LiftR.o\n\tsrc/Subsystems/DriveTrain.cpp","distinct":true,"url":"https://api.github.com/repos/CougarRobotics1982/Robot2015Code/commits/e0a9b19f3e8d23c9f5d36d7b8c9efd295b1cd8a6"}]}