diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-20 23:57:47 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-20 23:57:47 -0500 |
| commit | 45a58de53937816d535311a7c009829120a8c8e8 (patch) | |
| tree | f4e4434904b465a821bab9114ce5aaafbf8b90b6 /MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs | |
| parent | 02aee9dc9054680e895e8ad83822e026fb445d21 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs')
0 files changed, 0 insertions, 0 deletions