update merge

This commit is contained in:
Luke Pulverenti
2015-09-20 13:36:09 -04:00
parent 4492dcc592
commit d3b8557ab6
3 changed files with 3 additions and 3 deletions

View File

@@ -290,4 +290,4 @@ namespace MediaBrowser.Server.Implementations.Devices
return config.GetConfiguration<DevicesOptions>("devices");
}
}
}
}