Please sign in to comment.
Hopefully make it so conflicts in the xcode project files are automat…
…ically resolved. This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
- Loading branch information...