{"shas":[["fa1859aaa1c311ee22f1f7c7339ff7e2ad339acf","751dbf1db86b1587f7ca643c536530ff877b34b8@gmail.com","\tmodified:   src/ball.cc\n\tmodified:   src/collider.cc\n\tmodified:   src/defs.h\n\tmodified:   src/main.cc\n\tmodified:   src/object.cc\n\tmodified:   src/robot.cc\n\tmodified:   src/robot.h\n\tmodified:   src/simulator.cc\n\tmodified:   src/simulator.h","stephanie"],["fe5f6f579ca72eba5fb4c4be350d608b32f5f279","751dbf1db86b1587f7ca643c536530ff877b34b8@gmail.com","Merge branch 'master' of github.com:Stephanie2/SIM\n\nConflicts:\n\tsrc/ball.cc\n\tsrc/defs.h\n\tsrc/main.cc\n\tsrc/object.cc\n\tsrc/robot.cc\n\tsrc/simulator.cc","stephanie"],["79b3644dfd68eb405c0937ade1d45332e285b8ab","751dbf1db86b1587f7ca643c536530ff877b34b8@gmail.com","\tmodified:   src/ball.cc\n\tmodified:   src/defs.h\n\tmodified:   src/object.cc\n\tmodified:   src/object.h\n\tmodified:   src/robot.cc\n\tmodified:   src/robot.h","stephanie"]],"ref":"refs/heads/master","size":3,"head":"79b3644dfd68eb405c0937ade1d45332e285b8ab","push_id":42448484}