Conflicts: KaraokePlayer/App.config Signed-off-by: Matt Bruce <mbrucedogs@gmail.com> |
||
|---|---|---|
| CdgLib | ||
| CdgPlayer | ||
| ConsoleApplication1 | ||
| FirebaseKaraoke | ||
| Herse.Models | ||
| KaraokePlayer | ||
| SongCrawler | ||
| TestSelector | ||
| TestSongs | ||
| .gitattributes | ||
| .gitignore | ||
| KaraokePlayer.sln | ||
Conflicts: KaraokePlayer/App.config Signed-off-by: Matt Bruce <mbrucedogs@gmail.com> |
||
|---|---|---|
| CdgLib | ||
| CdgPlayer | ||
| ConsoleApplication1 | ||
| FirebaseKaraoke | ||
| Herse.Models | ||
| KaraokePlayer | ||
| SongCrawler | ||
| TestSelector | ||
| TestSongs | ||
| .gitattributes | ||
| .gitignore | ||
| KaraokePlayer.sln | ||