{"ref":"refs/heads/master","push_id":55238135,"commits":[{"sha":"58546d358e4c7b82eab31b8064e15ed05770f5fc","author":{"email":"ec5ec9d1fc1d75e8a6e8ddec78d785710750c02b@gmail.com","name":"Falco Peijnenburg"},"url":"https://api.github.com/repos/FPtje/Informatica-introductieproject/commits/58546d358e4c7b82eab31b8064e15ed05770f5fc","message":"SelectedShopList now gets ShopList object from ShopListActivity.\nThis is put in the private shoplist member in SelectedShopList.java"},{"sha":"7ada7de270a178b4443f14b94354c85c20a1447c","author":{"email":"ec5ec9d1fc1d75e8a6e8ddec78d785710750c02b@gmail.com","name":"Falco Peijnenburg"},"url":"https://api.github.com/repos/FPtje/Informatica-introductieproject/commits/7ada7de270a178b4443f14b94354c85c20a1447c","message":"Conflicten gefixt\nMerge branch 'master' of github.com:FPtje/Informatica-introductieproject\n\nConflicts:\n\tAndroidApp/ShopApp/bin/ShopApp.apk\n\tAndroidApp/ShopApp/src/ShopApp/boundary/SelectedShopListActivity.java\n\tAndroidApp/ShopApp/src/ShopApp/boundary/ShopListActivity.java"}],"head":"7ada7de270a178b4443f14b94354c85c20a1447c","size":2}