mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
fix merge conflict
This commit is contained in:
parent
7fdd180b20
commit
926b7fd42d
1 changed files with 3 additions and 9 deletions
|
@ -1569,15 +1569,6 @@
|
|||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\font-roboto\roboto.html">
|
||||
<Link>Resources\dashboard-ui\bower_components\font-roboto\roboto.html</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\changelog.js">
|
||||
<Link>Resources\dashboard-ui\bower_components\hammerjs\changelog.js</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.js">
|
||||
<Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.js</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.min.js">
|
||||
<Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.min.js</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\LICENSE">
|
||||
<Link>Resources\dashboard-ui\bower_components\headroomjs\LICENSE</Link>
|
||||
</BundleResource>
|
||||
|
@ -1917,6 +1908,9 @@
|
|||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logo.png">
|
||||
<Link>Resources\dashboard-ui\css\images\logo.png</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logoblack.png">
|
||||
<Link>Resources\dashboard-ui\css\images\logoblack.png</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogoicon.png">
|
||||
<Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link>
|
||||
</BundleResource>
|
||||
|
|
Loading…
Reference in a new issue