diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
| commit | d661f690f58cd05be86843d2c7c8a2984c66c2f6 (patch) | |
| tree | 1eb3a9885782512ddf29e215dd69981699c2edeb /MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs | |
| parent | 352ff3b212c435e6b407df2f985fd9f3ef39215c (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs')
0 files changed, 0 insertions, 0 deletions