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