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
3 s.version = "3.1.4.092717" 4 s.version = "3.1.4.092717"
  5 +=======
  6 + s.version = "3.1.4.091013"
  7 +>>>>>>> d09eb9a23ac88859d7a742f42caddf95af74d47d
4 s.summary = "和缓视频医生 SDK" 8 s.summary = "和缓视频医生 SDK"
5 9
6 s.description = <<-DESC 10 s.description = <<-DESC