GitHub PushEvent at 2014-01-14 17:25:23
Repository: LEGO-Mindstorms
Actor: tadamiec
Payload: {"shas":[["5bb6e33227b8a56a5c45e44a281ee3288463d04b","356aa5715e6d9d762dfe5fd435750b233ea1c3b1@gmail.com","Symbol reading","tadamiec",true],["f2c7ca636c6f95ff27e79414355ba17744f465a9","356aa5715e6d9d762dfe5fd435750b233ea1c3b1@gmail.com","Merge branch 'master' of https://github.com/tadamiec/LEGO-Mindstorms.git\n\nConflicts:\n\tIARobot/Main.nxd\n\tIARobot/Main.nxj\n\tIARobot/bin/Main.class\n\tIARobot/src/Main.java","tadamiec",true],["b0d5a0bc7656b6ae1d54231ae0256cb579ea3281","356aa5715e6d9d762dfe5fd435750b233ea1c3b1@gmail.com","Merge branch 'master' of https://github.com/tadamiec/LEGO-Mindstorms.git\n\nConflicts:\n\tIARobot/Main.nxd\n\tIARobot/Main.nxj\n\tIARobot/bin/FollowTheWall.class\n\tIARobot/bin/LevelBarCode.class\n\tIARobot/bin/Main.class\n\tIARobot/src/CollisionLeft.java\n\tIARobot/src/FollowTheWall.java\n\tIARobot/src/Main.java","tadamiec",true]],"size":3,"ref":"refs/heads/master","head":"b0d5a0bc7656b6ae1d54231ae0256cb579ea3281"}