Fixed Pod file issue

CedarMaps.podspec

@@ -9,11 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "CedarMaps"
-<<<<<<< HEAD
-  s.version          = "0.1.5"
-=======
   s.version          = "0.1.6"
->>>>>>> 1766494c026571b2a14d94b96c70b5601f0d23a9
   s.summary          = "Cedar Studio iOS SDK"
   s.description      = "Cedar Studio should write something to introduce their Pod."
   s.homepage         = "http://cedar.ir"
@@ -31,5 +27,5 @@ Pod::Spec.new do |s|
 
   s.public_header_files = 'Pod/Classes/**/*.h'
   s.frameworks = 'UIKit'
-  s.dependency 'Mapbox-iOS-SDK', '~> 1.6.1'
+  s.dependency 'Mapbox-iOS-SDK', '1.6.0'
 end
\ No newline at end of file