cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 18:42:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti 2017-02-09 19:38:58 -05:00
parent 7fdd180b20
commit 926b7fd42d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -1569,15 +1569,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\font-roboto\roboto.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\font-roboto\roboto.html">
<Link>Resources\dashboard-ui\bower_components\font-roboto\roboto.html</Link> <Link>Resources\dashboard-ui\bower_components\font-roboto\roboto.html</Link>
</BundleResource> </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"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\LICENSE">
<Link>Resources\dashboard-ui\bower_components\headroomjs\LICENSE</Link> <Link>Resources\dashboard-ui\bower_components\headroomjs\LICENSE</Link>
</BundleResource> </BundleResource>
@ -1917,6 +1908,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logo.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logo.png">
<Link>Resources\dashboard-ui\css\images\logo.png</Link> <Link>Resources\dashboard-ui\css\images\logo.png</Link>
</BundleResource> </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"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogoicon.png">
<Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link> <Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link>
</BundleResource> </BundleResource>