aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/IO/IFileSystem.cs
diff options
context:
space:
mode:
authorPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
committerPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
commita0d31a49a0047a39cb2c4f7d67be64153b0a3266 (patch)
tree8c0b3a7fb0b68bf778b92872a32949a88b891d80 /MediaBrowser.Model/IO/IFileSystem.cs
parent6bbb968b578fe42224227b70e78825bbed5cfc6f (diff)
parent6c6e9ca9f22d4c4bd1175d4abae846d09d2f074d (diff)
merging with master to clear merge conflict
Diffstat (limited to 'MediaBrowser.Model/IO/IFileSystem.cs')
-rw-r--r--MediaBrowser.Model/IO/IFileSystem.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 6c9b2bd88..e0771245f 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -113,8 +113,6 @@ namespace MediaBrowser.Model.IO
Stream GetFileStream(string path, FileOpenMode mode, FileAccessMode access, FileShareMode share,
FileOpenOptions fileOpenOptions);
- string DefaultDirectory { get; }
-
/// <summary>
/// Swaps the files.
/// </summary>