{"push_id":798556782,"size":1,"distinct_size":1,"ref":"refs/heads/enhancement_computerplayer_fights","head":"928eba1b10029fc57963e513ec56c5d94b1db79a","before":"2428f1325701b403e48ba76279ff9b3305dae6b6","commits":[{"sha":"928eba1b10029fc57963e513ec56c5d94b1db79a","author":{"email":"8f66d5dfe8692d2ad7a65349b873fd3aee78bda1@gmail.com","name":"Stephan Bauer"},"message":"Merge remote-tracking branch 'remotes/origin/feature_computerplayer' into enhancement_computerplayer_fights\n\n# Conflicts:\n#\tjsettlers.logic/src/jsettlers/ai/highlevel/AiStatistics.java\n#\tjsettlers.tests/resources/autoreplay/basicProduction-mountainlake/savegame-15m.map\n#\tjsettlers.tests/resources/autoreplay/fullProduction-mountainlake/savegame-10m.map\n#\tjsettlers.tests/resources/autoreplay/fullProduction-mountainlake/savegame-20m.map\n#\tjsettlers.tests/resources/autoreplay/fullProduction-mountainlake/savegame-30m.map\n#\tjsettlers.tests/resources/autoreplay/fullProduction-mountainlake/savegame-40m.map\n#\tjsettlers.tests/resources/autoreplay/fullProduction-mountainlake/savegame-50m.map","distinct":true,"url":"https://api.github.com/repos/jsettlers/settlers-remake/commits/928eba1b10029fc57963e513ec56c5d94b1db79a"}]}