Skip to content

C
cocoapods
Commit 6fe59845 authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

[Changelog] 

/c @0xced
parent b5606102
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
CHANGELOG.md
View file @ 6fe59845
...@@ -17,8 +17,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -17,8 +17,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
* CocoaPods will now leverage the [xcproj](https://github.com/0xced/xcproj) * CocoaPods will now leverage the [xcproj](https://github.com/0xced/xcproj)
command line tool if available in the path of the user to touch saved command line tool if available in the path of the user to touch saved
projects. This will result in projects serialized in the exact format used by projects. This will result in projects being serialized in the exact format
Xcode eliminating merge conflicts and other related issues. used by Xcode eliminating merge conflicts and other related issues. To learn
more about how to install xcproj see its
[readme](https://github.com/0xced/xcproj).
[Cédric Luthi](https://github.com/0xced) [Cédric Luthi](https://github.com/0xced)
[#1275](https://github.com/CocoaPods/CocoaPods/issues/1275) [#1275](https://github.com/CocoaPods/CocoaPods/issues/1275)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment