{"push_id":621052248,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"4fc04c660c08ce445d2c1f650f0f4da455871839","before":"cf622214623c2f9718e1bcf4cde59419fa24dd26","commits":[{"sha":"ab565ee9ed859304cbf7a3afbb4b5bd228061b8c","author":{"email":"8531a1880f145620b8b54770e7ab221ec7129735@163.com","name":"chaoweili"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tPodfile\n\tPodfile.lock\n\tPods/Manifest.lock\n\tPods/Pods.xcodeproj/project.pbxproj\n\tPods/Target Support\nFiles/Pods-AFNetworking/Pods-AFNetworking-Private.xcconfig\n\tPods/Target Support Files/Pods-FMDB/Pods-FMDB-Private.xcconfig\n\tPods/Target Support\nFiles/Pods-SDWebImage/Pods-SDWebImage-Private.xcconfig\n\tPods/Target Support Files/Pods/Pods-acknowledgements.markdown\n\tPods/Target Support Files/Pods/Pods-acknowledgements.plist\n\tPods/Target Support Files/Pods/Pods-environment.h\n\tPods/Target Support Files/Pods/Pods.debug.xcconfig\n\tPods/Target Support Files/Pods/Pods.release.xcconfig\n\tShowCar.xcodeproj/project.pbxproj\n\tShowCar/ViewController/AnliListViewController.m","distinct":true,"url":"https://api.github.com/repos/TeamOfFBAuto/ShowCar/commits/ab565ee9ed859304cbf7a3afbb4b5bd228061b8c"},{"sha":"4fc04c660c08ce445d2c1f650f0f4da455871839","author":{"email":"8531a1880f145620b8b54770e7ab221ec7129735@163.com","name":"chaoweili"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tPodfile\n\tPodfile.lock\n\tPods/Manifest.lock\n\tPods/Pods.xcodeproj/project.pbxproj\n\tPods/Target Support\nFiles/Pods-AFNetworking/Pods-AFNetworking-Private.xcconfig\n\tPods/Target Support Files/Pods-FMDB/Pods-FMDB-Private.xcconfig\n\tPods/Target Support\nFiles/Pods-SDWebImage/Pods-SDWebImage-Private.xcconfig\n\tPods/Target Support Files/Pods/Pods-acknowledgements.markdown\n\tPods/Target Support Files/Pods/Pods-acknowledgements.plist\n\tPods/Target Support Files/Pods/Pods-environment.h\n\tPods/Target Support Files/Pods/Pods.debug.xcconfig\n\tPods/Target Support Files/Pods/Pods.release.xcconfig\n\tShowCar.xcodeproj/project.pbxproj\n\tShowCar/ViewController/AnliListViewController.m","distinct":true,"url":"https://api.github.com/repos/TeamOfFBAuto/ShowCar/commits/4fc04c660c08ce445d2c1f650f0f4da455871839"}]}