wangguolei

sdk upgrade

1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 s.name = "HHVDoctorSDK" 2 s.name = "HHVDoctorSDK"
3 -<<<<<<< HEAD  
4 - s.version = "3.1.4.092718"  
5 -======= 3 +
6 s.version = "3.1.4.092718" 4 s.version = "3.1.4.092718"
7 ->>>>>>> d09eb9a23ac88859d7a742f42caddf95af74d47d  
8 s.summary = "和缓视频医生 SDK" 5 s.summary = "和缓视频医生 SDK"
9 6
10 s.description = <<-DESC 7 s.description = <<-DESC