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