diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:46:59 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:46:59 -0500 |
| commit | 76bfde2675f832ad389f8d83148cddb66c214f0e (patch) | |
| tree | 14a8cf830c6f16922bbfae2cd11507ab56214e6d /MediaBrowser.Server.Mono/Native | |
| parent | 29e03046edf33cf3048c771bd056322d463dcd21 (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Server.Mono/Native')
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 8f3006e116..31d4592c8e 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -119,7 +119,7 @@ namespace MediaBrowser.Server.Mono.Native { get { - return Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux; + return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx; } } |