Skip to content

Commit

Permalink
Merge branch 'master' into ikesyo-immutable-mappable
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
tristanhimmelman committed Mar 2, 2015
2 parents 0c3f637 + 42d9485 commit b8b1a01
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ struct Temperature: Mappable {
}

mutating func mapping(map: Map) {
celcius <- map["celcius"]
fahrenheit <- map["fahrenheit"]
celcius <- map["celcius"]
fahrenheit <- map["fahrenheit"]
}
}
```
Expand Down Expand Up @@ -127,12 +127,12 @@ public protocol TransformType {
##Installation
ObjectMapper can be added to your project using [Cocoapods 0.36 (beta)](http://blog.cocoapods.org/Pod-Authors-Guide-to-CocoaPods-Frameworks/) by adding the following line to your Podfile:
```
pod 'ObjectMapper', '~> 0.5'
pod 'ObjectMapper', '~> 0.7'
```

If your using [Carthage](https://github.com/Carthage/Carthage) you can add a dependency on ObjectMapper by adding it to your Cartfile:
```
github "Hearst-DD/ObjectMapper" ~> 0.5
github "Hearst-DD/ObjectMapper" ~> 0.7
```

Otherwise, ObjectMapper can be added as a submodule:
Expand Down

0 comments on commit b8b1a01

Please sign in to comment.