# Conflicts: # MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents |
||
|---|---|---|
| MusicPlayer | ||
| MusicPlayer.xcodeproj | ||
| MusicPlayer.xcworkspace | ||
| Pods | ||
| .gitignore | ||
| Podfile | ||
| Podfile.lock | ||
# Conflicts: # MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents |
||
|---|---|---|
| MusicPlayer | ||
| MusicPlayer.xcodeproj | ||
| MusicPlayer.xcworkspace | ||
| Pods | ||
| .gitignore | ||
| Podfile | ||
| Podfile.lock | ||