{"push_id":560434128,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"aab46b2a7e314f74d32b19ac57ed9c5324e8c787","before":"74dbe4b31a394404e01a83c41c55d288876b574f","commits":[{"sha":"10887df38973a5c08759e3ceca1966fe88cf8459","author":{"email":"07a1906b15632b4f231caf64ec6ad2708a9c232d@gmail.com","name":"Thomas"},"message":"Added delegation exercise","distinct":true,"url":"https://api.github.com/repos/davescherler/MOB-DC-01/commits/10887df38973a5c08759e3ceca1966fe88cf8459"},{"sha":"aab46b2a7e314f74d32b19ac57ed9c5324e8c787","author":{"email":"fff9d5efa46a136c816ee4bf467ae1db554ba6c4@gmail.com","name":"Dave Scherler"},"message":"Resolving merge conflicts with blackjack assignment\n\nMerge branch 'master' of https://github.com/ga-students/MOB-DC-01\n\nConflicts:\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/project.pbxproj\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/project.xcworkspace/contents.xcworkspacedata\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/tedikonda.xcuserdatad/xcschemes/Assessment 3.xcscheme\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/tedikonda.xcuserdatad/xcschemes/xcschememanagement.plist\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/AppDelegate.swift\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/Base.lproj/LaunchScreen.xib\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/Base.lproj/Main.storyboard\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/Images.xcassets/AppIcon.appiconset/Contents.json\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/Info.plist\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/SecondViewController.swift\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3/ViewController.swift\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3Tests/Assessment_3Tests.swift\n\tAssesments/Week 3/Assessment - BlackJack/Assessment 3Tests/Info.plist\n\tClasswork/Arrays Project - Lesson 10/Arrays Project - Lesson 10/Images.xcassets/AppIcon.appiconset/Contents.json\n\tClasswork/IB/Interface Builder and Functions/Info.plist\n\tClasswork/IB/Interface Builder and FunctionsTests/Info.plist\n\tHomework/Assessment - BlackJack/Assessment 3.xcodeproj/project.pbxproj\n\tHomework/Assessment - BlackJack/Assessment 3.xcodeproj/project.xcworkspace/contents.xcworkspacedata\n\tHomework/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/Dave.xcuserdatad/xcschemes/Assessment 3.xcscheme\n\tHomework/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/Dave.xcuserdatad/xcschemes/xcschememanagement.plist\n\tHomework/Assessment - BlackJack/Assessment 3/AppDelegate.swift\n\tHomework/Assessment - BlackJack/Assessment 3/Base.lproj/LaunchScreen.xib\n\tHomework/Assessment - BlackJack/Assessment 3/Base.lproj/Main.storyboard\n\tHomework/Assessment - BlackJack/Assessment 3/SecondViewController.swift\n\tHomework/Assessment - BlackJack/Assessment 3/ViewController.swift\n\tHomework/Assessment - BlackJack/Assessment 3Tests/Assessment_3Tests.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/project.pbxproj\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/project.xcworkspace/contents.xcworkspacedata\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/tedikonda.xcuserdatad/xcschemes/Assessment 3.xcscheme\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3.xcodeproj/xcuserdata/tedikonda.xcuserdatad/xcschemes/xcschememanagement.plist\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/AppDelegate.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/Base.lproj/LaunchScreen.xib\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/Base.lproj/Main.storyboard\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/CardGame.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/Images.xcassets/AppIcon.appiconset/Contents.json\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/Info.plist\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/Player.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/SecondViewController.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3/ViewController.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3Tests/Assessment_3Tests.swift\n\tSolutions/Week 3/Assessment - BlackJack/Assessment 3Tests/Info.plist","distinct":true,"url":"https://api.github.com/repos/davescherler/MOB-DC-01/commits/aab46b2a7e314f74d32b19ac57ed9c5324e8c787"}]}