# Conflicts: # .DS_Store |
||
|---|---|---|
| Ifish | ||
| Ifish.xcodeproj | ||
| IfishTests | ||
| IfishUITests | ||
| en.lproj | ||
| fastlane | ||
| zh-Hans.lproj | ||
| .DS_Store | ||
| .gitignore | ||
| Gemfile | ||
| Gemfile.lock | ||
# Conflicts: # .DS_Store |
||
|---|---|---|
| Ifish | ||
| Ifish.xcodeproj | ||
| IfishTests | ||
| IfishUITests | ||
| en.lproj | ||
| fastlane | ||
| zh-Hans.lproj | ||
| .DS_Store | ||
| .gitignore | ||
| Gemfile | ||
| Gemfile.lock | ||