{"push_id":636927875,"size":6,"distinct_size":6,"ref":"refs/heads/master","head":"62f4e5815d19267042a056789ca328d39166acd5","before":"b3a7d3397834664514452be6abd598f8af333c85","commits":[{"sha":"703aa6239db1a0264004bad501f44eff3a23932d","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"Warning resolving","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/703aa6239db1a0264004bad501f44eff3a23932d"},{"sha":"d700119ea78c8fbc7f5ca36db7324d3d4577fba6","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"PokerChips in the works","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/d700119ea78c8fbc7f5ca36db7324d3d4577fba6"},{"sha":"fb4a771b1ec3796e323fc40bd6dabcd0e75a4b82","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"PokerChips in the works","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/fb4a771b1ec3796e323fc40bd6dabcd0e75a4b82"},{"sha":"7ea6712c7dd48100f54766883e3a4964bed6aea9","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/Cards/Card.java\n\tsrc/Cards/CardList.java\n\tsrc/GUI/Components/DealerComponent.java\n\tsrc/GUI/Components/PlayerComponent.java\n\tsrc/GUI/Pictures/Images.java\n\tsrc/GUI/PokerComponent.java\n\tsrc/GUI/PokerFrame.java\n\tsrc/GUI/StartMenu.java\n\tsrc/Person/Bot.java\n\tsrc/PokerRules/AbstractGame.java\n\tsrc/PokerRules/AbstractPokermoves.java\n\tsrc/PokerRules/BlackJack/BlackJack.java\n\tsrc/PokerRules/HighestCard/HighestCard.java\n\tsrc/PokerRules/TexasHoldem/TexasHoldem.java\n\tsrc/PokerRules/TexasHoldem/TexasHoldemAction.java\n\tsrc/Table/PokerGame.java","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/7ea6712c7dd48100f54766883e3a4964bed6aea9"},{"sha":"251ea5c15562a0b03e0b70c29b4e9fcd8daeb575","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/Cards/Card.java\n\tsrc/Cards/CardList.java\n\tsrc/GUI/Components/DealerComponent.java\n\tsrc/GUI/Components/PlayerComponent.java\n\tsrc/GUI/Pictures/Images.java\n\tsrc/GUI/PokerComponent.java\n\tsrc/GUI/PokerFrame.java\n\tsrc/GUI/StartMenu.java\n\tsrc/Person/Bot.java\n\tsrc/PokerRules/AbstractGame.java\n\tsrc/PokerRules/AbstractPokermoves.java\n\tsrc/PokerRules/BlackJack/BlackJack.java\n\tsrc/PokerRules/HighestCard/HighestCard.java\n\tsrc/PokerRules/TexasHoldem/TexasHoldem.java\n\tsrc/PokerRules/TexasHoldem/TexasHoldemAction.java\n\tsrc/Table/PokerGame.java","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/251ea5c15562a0b03e0b70c29b4e9fcd8daeb575"},{"sha":"62f4e5815d19267042a056789ca328d39166acd5","author":{"email":"0c9a0640dfbb9e0b8100353c1298ef9e64085715@outlook.com","name":"Fleskvegg"},"message":"Merge remote-tracking branch 'remotes/Fleskvegg/master'","distinct":true,"url":"https://api.github.com/repos/Fleskvegg/ManualMerge/commits/62f4e5815d19267042a056789ca328d39166acd5"}]}