-
Eloy Duran authored
Start on simple resolving. We don't try to fix conflicts yet to keep things simple, so for now that's up to the user.
701db816
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| cocoa_pods | ||
| cocoa_pods.rb |
Start on simple resolving. We don't try to fix conflicts yet to keep things simple, so for now that's up to the user.
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| cocoa_pods | ||
| cocoa_pods.rb |