- version number updates

tristanhimmelman · Oct 11, 2018 · dab7687 · dab7687
1 parent 175b95a
commit dab7687
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ObjectMapper.podspec b/ObjectMapper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ObjectMapper'
-  s.version = '3.3.0'
+  s.version = '3.4.0'
   s.license = 'MIT'
   s.summary = 'JSON Object mapping written in Swift'
   s.homepage = 'https://github.com/Hearst-DD/ObjectMapper'

diff --git a/README.md b/README.md
@@ -470,14 +470,15 @@ Before submitting any pull request, please ensure you have run the included test
 ObjectMapper can be added to your project using [CocoaPods 0.36 or later](http://blog.cocoapods.org/Pod-Authors-Guide-to-CocoaPods-Frameworks/) by adding the following line to your `Podfile`:
 
 ```ruby
-pod 'ObjectMapper', '~> 3.3'
+pod 'ObjectMapper', '~> 3.4'
 ```
 
 ### Carthage
 If you're using [Carthage](https://github.com/Carthage/Carthage) you can add a dependency on ObjectMapper by adding it to your `Cartfile`:
 
 ```
-github "Hearst-DD/ObjectMapper" ~> 3.3
+<<<<<<< Updated upstream
+github "Hearst-DD/ObjectMapper" ~> 3.4
 ```
 
 ### Swift Package Manager