{"push_id":623547239,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"dedb49ad458fa29b30114848044e49eb31d98de7","before":"ff58ffc6f10259ac29f68df695cfe226298e631c","commits":[{"sha":"36f0c76f16b034b90a755645bd82c1e96cbcd8e2","author":{"email":"55b9523f9b69d645888600b0fc6ec51abcaad33f@gmail.com","name":"Cal Barkman"},"message":"Nothing Important\n\nJust syncing the local git changes.","distinct":true,"url":"https://api.github.com/repos/nahallacman/SeniorProject/commits/36f0c76f16b034b90a755645bd82c1e96cbcd8e2"},{"sha":"dedb49ad458fa29b30114848044e49eb31d98de7","author":{"email":"55b9523f9b69d645888600b0fc6ec51abcaad33f@gmail.com","name":"Cal Barkman"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tEthKitTCP/TCPIP/CodeFromMicrochip/MPLAB.X/.map\n\tEthKitTCP/TCPIP/CodeFromMicrochip/MPLAB.X/build/XC32-PIC32_ETH_SK_ETH795/debug/_ext/1386482886/PS2.o\n\tEthKitTCP/TCPIP/CodeFromMicrochip/MPLAB.X/build/XC32-PIC32_ETH_SK_ETH795/debug/_ext/1472/CustomHTTPApp.o\n\nfixing conflicts","distinct":true,"url":"https://api.github.com/repos/nahallacman/SeniorProject/commits/dedb49ad458fa29b30114848044e49eb31d98de7"}]}