diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:22:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:22:34 -0400 |
| commit | e8010955dc10c4be9b73c9a10de84356744b1cca (patch) | |
| tree | a9ef54677aa26a88e1134abfe6f799a778824f8d /MediaBrowser.Server.Implementations/Devices | |
| parent | 6d3dcd826695973fd958c92a775416a2e7b65835 (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Server.Implementations/Devices')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Devices/DeviceManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs index a6a8b3a7a1..0feacc9751 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs @@ -157,7 +157,7 @@ namespace MediaBrowser.Server.Implementations.Devices _libraryMonitor.ReportFileSystemChangeBeginning(path); - _fileSystem.CreateDirectory(Path.GetDirectoryName(path)); + Directory.CreateDirectory(Path.GetDirectoryName(path)); try { @@ -290,4 +290,4 @@ namespace MediaBrowser.Server.Implementations.Devices return config.GetConfiguration<DevicesOptions>("devices"); } } -} +}
\ No newline at end of file |