From a38794210776ed428c5de1c5a6265d2e23efbcb2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 8 Jan 2016 13:52:45 -0500
Subject: [PATCH] fix merge conflict

---
 .../Emby.Server.Mac.csproj                    | 27 ++++++++++++++++---
 SharedVersion.cs                              |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 374476d928..6cc96490e8 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -488,6 +488,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\reports.html">
       <Link>Resources\dashboard-ui\reports.html</Link>
     </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\robots.txt">
+      <Link>Resources\dashboard-ui\robots.txt</Link>
+    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scheduledtask.html">
       <Link>Resources\dashboard-ui\scheduledtask.html</Link>
     </BundleResource>
@@ -545,9 +548,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\userprofiles.html">
       <Link>Resources\dashboard-ui\userprofiles.html</Link>
     </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\vulcanize.txt">
-      <Link>Resources\dashboard-ui\vulcanize.txt</Link>
-    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizardagreement.html">
       <Link>Resources\dashboard-ui\wizardagreement.html</Link>
     </BundleResource>
@@ -1121,6 +1121,15 @@
     <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\datetime.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\datetime.js</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.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>
@@ -1874,6 +1883,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\notification-icons.html">
       <Link>Resources\dashboard-ui\bower_components\iron-icons\notification-icons.html</Link>
     </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\places-icons.html">
+      <Link>Resources\dashboard-ui\bower_components\iron-icons\places-icons.html</Link>
+    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\social-icons.html">
       <Link>Resources\dashboard-ui\bower_components\iron-icons\social-icons.html</Link>
     </BundleResource>
@@ -3548,6 +3560,12 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.gitignore">
       <Link>Resources\dashboard-ui\bower_components\paper-progress\.gitignore</Link>
     </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.travis.yml">
+      <Link>Resources\dashboard-ui\bower_components\paper-progress\.travis.yml</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md">
+      <Link>Resources\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md</Link>
+    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\README.md">
       <Link>Resources\dashboard-ui\bower_components\paper-progress\README.md</Link>
     </BundleResource>
@@ -5207,6 +5225,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\hu.json">
       <Link>Resources\dashboard-ui\strings\html\hu.json</Link>
     </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\id.json">
+      <Link>Resources\dashboard-ui\strings\html\id.json</Link>
+    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\it.json">
       <Link>Resources\dashboard-ui\strings\html\it.json</Link>
     </BundleResource>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 323710f1ca..b4951f12dc 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5802")]
+[assembly: AssemblyVersion("3.0.5785.0")]