{"head":"bfec9390358e21e93a214174fda6d574f8b3b6f0","size":1,"push_id":46310135,"commits":[{"sha":"bfec9390358e21e93a214174fda6d574f8b3b6f0","author":{"name":"Kenny Du","email":"1de30fd921dc6fa4c8cb7698119cb76e65d6d99c@rpi.edu"},"url":"https://api.github.com/repos/MisterDEE/Food-4-Thought/commits/bfec9390358e21e93a214174fda6d574f8b3b6f0","message":"Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\tpantryProtector/bin/classes.dex\n\tpantryProtector/bin/pantryProtector.apk\n\tpantryProtector/bin/resources.ap_\n\tpantryProtector/res/values/strings.xml\n\tpantryProtector/src/us/food4thought/pantryprotect/PantryProtectorActivity.java"}],"ref":"refs/heads/master","legacy":{"head":"bfec9390358e21e93a214174fda6d574f8b3b6f0","size":1,"push_id":46310135,"shas":[["bfec9390358e21e93a214174fda6d574f8b3b6f0","duk@rpi.edu","Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\tpantryProtector/bin/classes.dex\n\tpantryProtector/bin/pantryProtector.apk\n\tpantryProtector/bin/resources.ap_\n\tpantryProtector/res/values/strings.xml\n\tpantryProtector/src/us/food4thought/pantryprotect/PantryProtectorActivity.java","Kenny Du"]],"ref":"refs/heads/master"}}