diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-09 19:38:58 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-09 19:38:58 -0500 |
| commit | 926b7fd42d0738f3afc39d6ab353535bb9fb948c (patch) | |
| tree | 7a4fd2b21cf73af1a0e37643344b4b663cf7c844 | |
| parent | 7fdd180b20fab8a49c89edf64f3bb529e517c5a9 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 7f3baf0c0..f7f084917 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -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>
|