diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-02-05 23:28:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 23:28:00 +0100 |
| commit | d5fcca3d052128543be3750ce2ae934662a0611b (patch) | |
| tree | c77c8df888ba6f335caf3e0c88bd5824b2c84852 /MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs | |
| parent | dc62e436c43362f2193415f4c81280c6c1a8560c (diff) | |
| parent | e8984ed3a9218ff6e37e798e0a2b5cdc4a09240c (diff) | |
Merge branch 'master' into naming
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs index d64feb2f7..addc88174 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Services; |
