{"push_id":913667716,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"0df6e0cf26d973f9c6b67309079d1d8039eda6f8","before":"88c6fedd7e5568d793695ca24263c0c4e13f2c79","commits":[{"sha":"d760a5ef5c1a34f84cb81a661b86f7d705ecd51c","author":{"email":"b9c3ff7451a35b7725b8b393d1c9537d263a0d4f@uconn.edu","name":"sun12002"},"message":"Discover Screen Design Updated","distinct":true,"url":"https://api.github.com/repos/sun12002/SeniorDesignProjectLIveLocalApp/commits/d760a5ef5c1a34f84cb81a661b86f7d705ecd51c"},{"sha":"0df6e0cf26d973f9c6b67309079d1d8039eda6f8","author":{"email":"b9c3ff7451a35b7725b8b393d1c9537d263a0d4f@uconn.edu","name":"sun12002"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tLiveLocal/app/src/main/AndroidManifest.xml\n\n#\tLiveLocal/app/src/main/java/com/example/sufian/livelocal/DiscoverFragment.java\n\n#\tLiveLocal/app/src/main/java/com/example/sufian/livelocal/EventActivity.java\n#\tLiveLocal/app/src/main/res/layout/content_event.xml\n#\tLiveLocal/app/src/main/res/layout/event_item.xml\n#\tLiveLocal/app/src/main/res/layout/fragment_discover.xml","distinct":true,"url":"https://api.github.com/repos/sun12002/SeniorDesignProjectLIveLocalApp/commits/0df6e0cf26d973f9c6b67309079d1d8039eda6f8"}]}