{"push_id":1045806343,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"001d74e2721f285a64bbe40f5e6dcc8487f1ae13","before":"f9080c24031ae2b8b2b74eddbb48df09b201ebc2","commits":[{"sha":"001d74e2721f285a64bbe40f5e6dcc8487f1ae13","author":{"email":"eea4a447ff4ca785252709f48af0bfa3c1a69334@10.18.149.130","name":"macds"},"message":"Merge origin/master\n\nConflicts:\n\tSurvival/src/byui/cit260/survival/control/InventoryControl.java\n\tSurvival/src/byui/cit260/survival/view/CheckOutItemView.java","distinct":true,"url":"https://api.github.com/repos/mdsope/Fife-Soper-Team/commits/001d74e2721f285a64bbe40f5e6dcc8487f1ae13"}]}