From 1d0b393e6969d9671daead8049973a374421046f Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Sun, 15 Oct 2017 08:47:24 -0600
Subject: Removed Magick.NET and added .gitignore

Removed Magick.NET and added a .gitignore to ignore storage.ide (visual
studio file, someitmes causes merge conflicts).
---
 ShiftOS.Engine/ShiftOS.Engine.csproj | 3 ---
 ShiftOS.Engine/packages.config       | 1 -
 2 files changed, 4 deletions(-)

(limited to 'ShiftOS.Engine')

diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj
index 2c9b364..3a505fb 100644
--- a/ShiftOS.Engine/ShiftOS.Engine.csproj
+++ b/ShiftOS.Engine/ShiftOS.Engine.csproj
@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\packages\Magick.NET-Q16-AnyCPU.7.0.7.300\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/ShiftOS.Engine/packages.config b/ShiftOS.Engine/packages.config
index 2f27f01..ee51c23 100644
--- a/ShiftOS.Engine/packages.config
+++ b/ShiftOS.Engine/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET-Q16-AnyCPU" version="7.0.7.300" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3