{"push_id":650484521,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"4bb894a29f1fc6d42d9c97449a9e02817a3b36bf","before":"69e6d53a4608f30478447e5ad2b3ba381bfbed2c","commits":[{"sha":"2330b64f8b496853a8b5c639737f721cae1be6a1","author":{"email":"d632f0545f55a31b4ca727976140181fc5c07fc3@gmail.com","name":"Ankita"},"message":"Merge x2\n\nConflicts:\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/dex/\ndebug/classes.dex\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/incr\nemental/mergeAssets/debug/merger.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/incr\nemental/mergeAssets/test/debug/merger.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/incr\nemental/mergeResources/debug/merger.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/incr\nemental/mergeResources/test/debug/merger.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/Parse-1.8.4-287986bfe35ac22bf690c2206eb85c94cd254aae.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/Parse-1.8.4-5f22741cdac77796c03b8d5ee5b9751da4ff1a68.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/Parse-1.8.4-7d59d588fd440d8858c2c96a91e4a399231b36db.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/ParseCrashReporting-1.8.4-669cc773a59d87b4cc121f76ec6668cca6\n05fdc8.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/ParseCrashReporting-1.8.4-6cb293f24b490c59a78947a35b0334646e\n1b850d.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/ParseCrashReporting-1.8.4-f995b48d0b2063e71a6952b3bb10e3689b\n0d5c67.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/bolts-android-1.1.4-203135653493071b7e9474d5d1df7d1f4b14013b\n.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/bolts-android-1.1.4-274c9419ef707f01e761f0f10245afc4cc06626d\n.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/bolts-android-1.1.4-c1a27db8856eb25316cf82da2e18222eb1e03381\n.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/classes-05195f18b46c15a2549105a3a0cd90b90d45ff54.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/classes-1a24508939e848aa9c97af5a5001943c19e23835.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/classes-31ad07a96d27bd37f85394ebc28e012a3d2fe986.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/internal_impl-21.0.3-06a5701559b48ea8ee15f4f07eb4dae8098e814\n0.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/internal_impl-21.0.3-5b2d8e27e31da67b4508cb2e1422c0d4401037a\n9.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/internal_impl-21.0.3-d3f4762d5db8179a29d694818c0492e91e7215d\n4.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/json-simple-1.1.1-297ae05d35028f15c94dc6af3342cc67b1e828f0.j\nar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/json-simple-1.1.1-bb9239e0d64fc9d661184567672c5715c8e61519.j\nar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/json-simple-1.1.1-db8fed04f0e6c45b2c4acc4c0abc4cfbecadf5ff.j\nar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/support-annotations-21.0.3-28d7f07a3af1d8eb36c7b7a6f9f723ca0\nab6f0c0.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/support-annotations-21.0.3-367b219f2f242df61994164a6d0e7e63e\n9c80fc0.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/pre-\ndexed/debug/support-annotations-21.0.3-e1777da8b2c6b5b6dde025771506ad9dc\ncd8f286.jar\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/drawable/layout_bg.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_cart.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_job_details.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_job_requestors_list.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_my_posted_jobs.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_notifications_page.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_searchable.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_sign_in.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/activity_view_requestor.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/job_creation_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/main.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/profile_tab_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/sample_cart_tab_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/sample_homepage_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/sign_in_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/sign_up_view.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/layout/venmo_webview.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_cart.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_homepage.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_job_creation.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_job_details.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_job_requestors.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_my_posted_jobs.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_notifications_page.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_profile.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_searchable.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_sign_in.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/menu/menu_view_requestor.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/values-w820dp-v13/values.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/values/values.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\ndebug/xml/searchable.xml\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\nresources-debug-test.ap_\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/res/\nresources-debug.ap_\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/intermediates/tmp/\ndex/debug/inputList.txt\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/outputs/apk/ParseS\ntarterProject-debug-unaligned.apk\n\nParse-Starter-Project-1.8.4/ParseStarterProject/build/outputs/apk/ParseS\ntarterProject-debug.apk\n\tParse-Starter-Project-1.8.4/build/intermediates/dex-cache/cache.xml\n\tParse-Starter-Project-1.8.4/local.properties","distinct":true,"url":"https://api.github.com/repos/joeyraso/CIS-350/commits/2330b64f8b496853a8b5c639737f721cae1be6a1"},{"sha":"4bb894a29f1fc6d42d9c97449a9e02817a3b36bf","author":{"email":"d632f0545f55a31b4ca727976140181fc5c07fc3@gmail.com","name":"Ankita"},"message":"Added Tabs to Homepage","distinct":true,"url":"https://api.github.com/repos/joeyraso/CIS-350/commits/4bb894a29f1fc6d42d9c97449a9e02817a3b36bf"}]}