diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-09 14:23:12 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-09 14:23:12 -0400 |
| commit | 9935397d12020c5a52afe9f8f390b5581bef5d03 (patch) | |
| tree | c55fee62f502dab932d92d05941d46f85d48c415 /MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs | |
| parent | 1d14c98ec8fbbccfd53a9fda726c241feb0c35b3 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs')
0 files changed, 0 insertions, 0 deletions