From 7ba2060238004582ead8ba4d2bdff09fff548e97 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 21 Jan 2017 19:52:20 +0100
Subject: [PATCH] More merge fixing

---
 OurUmbraco.Client/gulpfile.js                        |  2 +-
 OurUmbraco.Site/Assets/images/down.svg               |  2 +-
 OurUmbraco.Site/Assets/images/selectdown.svg         |  2 +-
 OurUmbraco.Site/Assets/images/selectdown_our.svg     |  2 +-
 OurUmbraco.Site/Assets/images/selectdown_unfocus.svg |  2 +-
 OurUmbraco/OurUmbraco.csproj                         | 10 ----------
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/OurUmbraco.Client/gulpfile.js b/OurUmbraco.Client/gulpfile.js
index 85086803..be5ac996 100644
--- a/OurUmbraco.Client/gulpfile.js
+++ b/OurUmbraco.Client/gulpfile.js
@@ -10,7 +10,7 @@ var gulp         = require('gulp'),
     imageMin     = require('gulp-imagemin'),
     clean        = require('gulp-clean'),
     svgmin       = require('gulp-svgmin'),
-    cmq          = require('gulp-group-css-media-queries');
+    cmq          = require('gulp-combine-media-queries');
 	rename       = require('gulp-rename');
 
 var settings = {
diff --git a/OurUmbraco.Site/Assets/images/down.svg b/OurUmbraco.Site/Assets/images/down.svg
index 55a3f2cc..0011de86 100644
--- a/OurUmbraco.Site/Assets/images/down.svg
+++ b/OurUmbraco.Site/Assets/images/down.svg
@@ -1 +1 @@
-<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.891 30.054L25 40.943l-10.89-10.89M25 9v31.445"/></svg>
\ No newline at end of file
+<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.89 30.054L25 40.944l-10.89-10.89M25 9v31.445"/></svg>
\ No newline at end of file
diff --git a/OurUmbraco.Site/Assets/images/selectdown.svg b/OurUmbraco.Site/Assets/images/selectdown.svg
index 1d00afc3..18499d94 100644
--- a/OurUmbraco.Site/Assets/images/selectdown.svg
+++ b/OurUmbraco.Site/Assets/images/selectdown.svg
@@ -1 +1 @@
-<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5z"/></svg>
\ No newline at end of file
+<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5"/></svg>
\ No newline at end of file
diff --git a/OurUmbraco.Site/Assets/images/selectdown_our.svg b/OurUmbraco.Site/Assets/images/selectdown_our.svg
index 8e3bbb8c..1e39d3c3 100644
--- a/OurUmbraco.Site/Assets/images/selectdown_our.svg
+++ b/OurUmbraco.Site/Assets/images/selectdown_our.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
\ No newline at end of file
diff --git a/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg b/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg
index a8657c91..348b2e8b 100644
--- a/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg
+++ b/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
\ No newline at end of file
diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj
index f58cf420..3c0b2a1b 100644
--- a/OurUmbraco/OurUmbraco.csproj
+++ b/OurUmbraco/OurUmbraco.csproj
@@ -584,13 +584,6 @@
     <Compile Include="Our\usercontrols\__EventEditor.ascx.designer.cs">
       <DependentUpon>__EventEditor.ascx.cs</DependentUpon>
     </Compile>
-    <Compile Include="Our\usercontrols\FileDownloadProxy.ascx.cs">
-      <DependentUpon>FileDownloadProxy.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Our\usercontrols\FileDownloadProxy.ascx.designer.cs">
-      <DependentUpon>FileDownloadProxy.ascx.cs</DependentUpon>
-    </Compile>
     <Compile Include="Our\usercontrols\__Forgotpassword.ascx.cs">
       <DependentUpon>__Forgotpassword.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -802,9 +795,6 @@
     <Content Include="Our\usercontrols\__EventEditor.ascx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="Our\usercontrols\FileDownloadProxy.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="Our\usercontrols\__Forgotpassword.ascx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>