restore changes

9 years ago · fae4079a69
parent 52f4962ca7
commit fae4079a69
2 changed files with 1 additions and 7 deletions
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@ -876,7 +876,7 @@ namespace MediaBrowser.MediaEncoding.Probing
            }
        }

-        private void ExtractTimestamp(Model.MediaInfo.MediaInfo video)
+        private void ExtractTimestamp(MediaInfo video)
        {
            if (video.VideoType == VideoType.VideoFile)
            {
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -356,12 +356,6 @@
    <Content Include="dashboard-ui\scripts\sections.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Include="dashboard-ui\themes\holiday\style.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="dashboard-ui\themes\holiday\theme.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.checkbox.css">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>