{"push_id":1112053839,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"aeca876a8ce8a361355e39353f3f118ccdd0e5a3","before":"6c64236d3b6f3f8f6000f25b56a8a343f6dc24c9","commits":[{"sha":"96eaa3c89ab24fdc46ebf052a352a24b11d6545b","author":{"email":"aea600c2271be172d88b775cce4fe5243362c44f@gmail.com","name":"Edgardo21"},"message":"Crear activity Add_Item para añadir alguna comida nueva al menu de comidas , pero aun no se añaden a los objetos de menu al momento, solo el xml.","distinct":true,"url":"https://api.github.com/repos/AndriodPros/HackPRFinal2/commits/96eaa3c89ab24fdc46ebf052a352a24b11d6545b"},{"sha":"7db02eb7ae610c06062a03a1cb188f54c2fcad63","author":{"email":"aea600c2271be172d88b775cce4fe5243362c44f@gmail.com","name":"Edgardo21"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tapp/build/intermediates/blame/res/debug/multi/values-af.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-am.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ar.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-az-rAZ.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-bg.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-bn-rBD.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ca.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-cs.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-da.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-de.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-el.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-en-rAU.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-en-rGB.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-en-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-es-rUS.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-es.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-et-rEE.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-eu-rES.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-fa.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-fi.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-fr-rCA.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-fr.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-gl-rES.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-gu-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-h320dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-h720dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-hdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-hi.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-hr.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-hu.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-hy-rAM.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-in.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-is-rIS.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-it.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-iw.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ja.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ka-rGE.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-kk-rKZ.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-km-rKH.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-kn-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ko.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ky-rKG.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-land.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-large-v4.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ldltr-v21.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-lo-rLA.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-lt.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-lv.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-mk-rMK.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ml-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-mn-rMN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-mr-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ms-rMY.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-my-rMM.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-nb.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ne-rNP.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-night-v8.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-nl.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-pa-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-pl.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-port.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-pt-rBR.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-pt-rPT.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-pt.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ro.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ru.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-si-rLK.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sk.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sl.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sq-rAL.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sr.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sv.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sw.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-sw600dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ta-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-te-rIN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-th.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-tl.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-tr.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-uk.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-ur-rPK.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-uz-rUZ.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v11.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v12.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v14.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v17.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v18.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v21.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v22.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-v23.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-vi.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w360dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w480dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w500dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w600dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w720dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-w820dp-v13.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-xlarge-land-v4.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-xlarge-v4.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-zh-rCN.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-zh-rHK.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-zh-rTW.json\n#\tapp/build/intermediates/blame/res/debug/multi/values-zu.json\n#\tapp/build/intermediates/blame/res/debug/multi/values.json\n#\tapp/build/intermediates/blame/res/debug/single/anim.json\n#\tapp/build/intermediates/blame/res/debug/single/color-v11.json\n#\tapp/build/intermediates/blame/res/debug/single/color-v23.json\n#\tapp/build/intermediates/blame/res/debug/single/color.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-ldrtl-hdpi-v17.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-ldrtl-mdpi-v17.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-ldrtl-xhdpi-v17.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-ldrtl-xxhdpi-v17.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-ldrtl-xxxhdpi-v17.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-mdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-v21.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-v23.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/drawable.json\n#\tapp/build/intermediates/blame/res/debug/single/layout.json\n#\tapp/build/intermediates/blame/res/debug/single/mipmap-hdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/mipmap-mdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/mipmap-xhdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/mipmap-xxhdpi-v4.json\n#\tapp/build/intermediates/blame/res/debug/single/mipmap-xxxhdpi-v4.json\n#\tapp/build/intermediates/classes/debug/com/example/cod5_/hackprfinal/MainActivity.class\n#\tapp/build/intermediates/classes/debug/com/example/cod5_/hackprfinal/Menu2$1.class\n#\tapp/build/intermediates/classes/debug/com/example/cod5_/hackprfinal/Menu2.class\n#\tapp/build/intermediates/incremental/mergeDebugResources/merger.xml\n#\tapp/build/intermediates/res/resources-debug-androidTest.ap_\n#\tapp/build/intermediates/res/resources-debug.ap_\n#\tapp/src/main/java/com/example/cod5_/hackprfinal/MenuMod.java","distinct":true,"url":"https://api.github.com/repos/AndriodPros/HackPRFinal2/commits/7db02eb7ae610c06062a03a1cb188f54c2fcad63"},{"sha":"aeca876a8ce8a361355e39353f3f118ccdd0e5a3","author":{"email":"aea600c2271be172d88b775cce4fe5243362c44f@gmail.com","name":"Edgardo21"},"message":"Crear activity Add_Item para añadir alguna comida nueva al menu de comidas , pero aun no se añaden a los objetos de menu al momento, solo el xml.","distinct":true,"url":"https://api.github.com/repos/AndriodPros/HackPRFinal2/commits/aeca876a8ce8a361355e39353f3f118ccdd0e5a3"}]}