{"push_id":1119328346,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"8da04b1b5ba871294f4621007a7ca1a763243c91","before":"3ed64c84a29a219e3b06cda9ec1bc390c012ed9c","commits":[{"sha":"03b67481a275196e59f2ea990c5760a4bfcf7874","author":{"email":"2dadaceba00d908e83a4edcce1e7f804ea4450d6@163.com","name":"Billhome"},"message":"Merge branch 'master' of https://github.com/cloudpluie/ElifeApp\n\n# Conflicts:\n#\t.idea/gradle.xml\n#\tapp/src/main/AndroidManifest.xml\n#\tapp/src/main/res/values/dimens.xml\n1、上面这些文件是公共的文件，但是我修改过了，注意合并一下\n2、首页头部搜索栏的制作","distinct":true,"url":"https://api.github.com/repos/cloudpluie/APP/commits/03b67481a275196e59f2ea990c5760a4bfcf7874"},{"sha":"8da04b1b5ba871294f4621007a7ca1a763243c91","author":{"email":"2dadaceba00d908e83a4edcce1e7f804ea4450d6@163.com","name":"Billhome"},"message":"Merge branch 'master' of https://github.com/cloudpluie/APP\n\n# Conflicts:\n#\tapp.iml\n#\tbuild.gradle\n#\tsrc/main/AndroidManifest.xml\n#\tsrc/main/java/cn/elife/elife/MainActivity.java\n#\tsrc/main/java/cn/elife/elife/SearchActivity.java\n#\tsrc/main/java/cn/elife/fragments/CartFragment.java\n#\tsrc/main/java/cn/elife/fragments/HomeFragment.java\n#\tsrc/main/java/cn/elife/fragments/MerchantFragment.java\n#\tsrc/main/java/cn/elife/widget/NoScrollScrollView.java\n#\tsrc/main/res/layout/activity_search.xml\n#\tsrc/main/res/layout/fragment_cart.xml\n#\tsrc/main/res/layout/fragment_home.xml\n#\tsrc/main/res/layout/fragment_topbar.xml\n#\tsrc/main/res/layout/item_activity_search.xml\n#\tsrc/main/res/layout/item_fragment_mechant.xml\n#\tsrc/main/res/layout/textview_activity_search.xml\n#\tsrc/main/res/layout/top_navigate_search.xml\n#\tsrc/main/res/values/colors.xml\n#\tsrc/main/res/values/strings.xml\n#\tsrc/main/res/values/styles.xml","distinct":true,"url":"https://api.github.com/repos/cloudpluie/APP/commits/8da04b1b5ba871294f4621007a7ca1a763243c91"}]}