michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti 2016-01-02 18:18:14 -05:00
parent 475529ec7f
commit 24f58d720f
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1115,6 +1115,15 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\bower.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\bower.json">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\bower.json</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\bower.json</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browser.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browser.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirecss.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirecss.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js</Link>
</BundleResource> </BundleResource>
@ -1160,30 +1169,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.bower.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.bower.json">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.bower.json</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\.bower.json</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.bowerrc">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.bowerrc</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.gitignore">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.gitignore</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.jscsrc">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.jscsrc</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.jshintrc">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.jshintrc</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\.travis.yml">
<Link>Resources\dashboard-ui\bower_components\hammerjs\.travis.yml</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CHANGELOG.md"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CHANGELOG.md">
<Link>Resources\dashboard-ui\bower_components\hammerjs\CHANGELOG.md</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\CHANGELOG.md</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md">
<Link>Resources\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\CONTRIBUTING.md</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\Gruntfile.coffee">
<Link>Resources\dashboard-ui\bower_components\hammerjs\Gruntfile.coffee</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\LICENSE.md"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\LICENSE.md">
<Link>Resources\dashboard-ui\bower_components\hammerjs\LICENSE.md</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\LICENSE.md</Link>
</BundleResource> </BundleResource>
@ -1193,8 +1184,8 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\bower.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\bower.json">
<Link>Resources\dashboard-ui\bower_components\hammerjs\bower.json</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\bower.json</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\component.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\changelog.js">
<Link>Resources\dashboard-ui\bower_components\hammerjs\component.json</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\changelog.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.js">
<Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.js</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.js</Link>
@ -1205,9 +1196,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.min.map"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\hammer.min.map">
<Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.min.map</Link> <Link>Resources\dashboard-ui\bower_components\hammerjs\hammer.min.map</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hammerjs\package.json">
<Link>Resources\dashboard-ui\bower_components\hammerjs\package.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroom.js\.bower.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroom.js\.bower.json">
<Link>Resources\dashboard-ui\bower_components\headroom.js\.bower.json</Link> <Link>Resources\dashboard-ui\bower_components\headroom.js\.bower.json</Link>
</BundleResource> </BundleResource>
@ -4169,6 +4157,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\webcomponentsjs\webcomponents.min.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\webcomponentsjs\webcomponents.min.js">
<Link>Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents.min.js</Link> <Link>Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents.min.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\chromecasthelpers.js">
<Link>Resources\dashboard-ui\components\chromecasthelpers.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\humanedate.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\humanedate.js">
<Link>Resources\dashboard-ui\components\humanedate.js</Link> <Link>Resources\dashboard-ui\components\humanedate.js</Link>
</BundleResource> </BundleResource>
@ -4181,8 +4172,8 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\prompt.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\prompt.js">
<Link>Resources\dashboard-ui\components\prompt.js</Link> <Link>Resources\dashboard-ui\components\prompt.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\requirecss.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\remotecontrolautoplay.js">
<Link>Resources\dashboard-ui\components\requirecss.js</Link> <Link>Resources\dashboard-ui\components\remotecontrolautoplay.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\sharingwidget.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\sharingwidget.js">
<Link>Resources\dashboard-ui\components\sharingwidget.js</Link> <Link>Resources\dashboard-ui\components\sharingwidget.js</Link>