diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-03 20:22:03 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-03 20:22:03 -0400 |
| commit | e0f40f57d81da7e45be4d991e3ed369f437bbf31 (patch) | |
| tree | e08dfcfdf1072ebdf1127247146305a7e90f97cd /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 0e195d2e49f4ee9979182603a356fdb7af8d98cf (diff) | |
| parent | a37b69a49387f32b47764bd9bfa49ca791c01014 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove-common-process
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index 38ef33caf..1127a08de 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -9,8 +9,8 @@ using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.IO; using MediaBrowser.Model.MediaInfo; -using MediaBrowser.Model.Session; using MediaBrowser.Model.Net; +using MediaBrowser.Model.Session; namespace MediaBrowser.Controller.MediaEncoding { |