diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:22:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:22:34 -0400 |
| commit | e8010955dc10c4be9b73c9a10de84356744b1cca (patch) | |
| tree | a9ef54677aa26a88e1134abfe6f799a778824f8d /MediaBrowser.Controller/Entities | |
| parent | 6d3dcd826695973fd958c92a775416a2e7b65835 (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 98d1eb4ce2..8cd0a8def8 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -140,4 +140,4 @@ namespace MediaBrowser.Controller.Entities.Audio return id; } } -} +}
\ No newline at end of file |