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