diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 14:30:14 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 14:30:14 -0500 |
| commit | aab0cea39a308fd68a2d256ab52a63c66934ed68 (patch) | |
| tree | a7fd3b1d63d714c0403a90310657bd961725b682 /MediaBrowser.Model/Configuration/ServerConfiguration.cs | |
| parent | f6d74d9a0e362e01c07dd3721dcea1e6efd0c5e5 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')
0 files changed, 0 insertions, 0 deletions