no message

Author: karisli

QCloudCOSXML.podspec

@@ -11,20 +11,16 @@ s.version              = "5.6.2"
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
   s.source_files = 'QCloudCOSXML/Classes/**/*'
-<<<<<<< HEAD
-  s.dependency "QCloudCore",'5.6.1'
-=======
+
   s.dependency "QCloudCore",'5.6.2'
->>>>>>> carthage
+
   s.static_framework = true
 
   s.subspec 'Transfer' do |sbt|
     sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
-<<<<<<< HEAD
-    sbt.dependency "QCloudCore",'5.6.1'
-=======
+
     sbt.dependency "QCloudCore",'5.6.2'
->>>>>>> carthage
+
  #   sbt.static_framework=true
   end
 end