{"push_id":661174074,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d4c05d68fa7c0b9db541fb00f63657c95464094d","before":"53d19e2c5b80d473d56a84427166cd71d3c37d35","commits":[{"sha":"0e29f2480d35f1a9eb8ff02f93fe1b9c6b3d6fca","author":{"email":"ea7d530154376451fc28c01bd4381dad90de08de@hotmail.com","name":"nls999"},"message":"Editable situationresources in tableview\n\nTime[h2]","distinct":true,"url":"https://api.github.com/repos/S-MW34/PTMW/commits/0e29f2480d35f1a9eb8ff02f93fe1b9c6b3d6fca"},{"sha":"d4c05d68fa7c0b9db541fb00f63657c95464094d","author":{"email":"ea7d530154376451fc28c01bd4381dad90de08de@hotmail.com","name":"nls999"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tField/src/main/java/Client/SituationResourcesPaneController.java","distinct":true,"url":"https://api.github.com/repos/S-MW34/PTMW/commits/d4c05d68fa7c0b9db541fb00f63657c95464094d"}]}