fix merge conflicts

This commit is contained in:
Luke Pulverenti
2016-01-19 14:46:59 -05:00
parent 29e03046ed
commit 76bfde2675
2 changed files with 6 additions and 6 deletions

View File

@@ -119,7 +119,7 @@ namespace MediaBrowser.Server.Mono.Native
{
get
{
return Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux;
return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx;
}
}