From 266e79a2c3f8d43edfa9af71abc3cddda8d33b5c Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Thu, 14 Jul 2016 10:48:15 -0600
Subject: [PATCH] Fixed a merge mistake regarding the Geckofx package version

---
 mRemoteV1/mRemoteV1.csproj | 8 ++++----
 mRemoteV1/packages.config  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 7eb90c4d2..c3cad9cc8 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -49,9 +49,9 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
-    </Reference>    
-    <Reference Include="Geckofx-Core, Version=45.0.19.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
-      <HintPath>..\packages\Geckofx45.45.0.19.0\lib\net40\Geckofx-Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Geckofx-Core, Version=45.0.20.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
+      <HintPath>..\packages\Geckofx45.45.0.20\lib\net40\Geckofx-Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Geckofx-Winforms, Version=45.0.20.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=MSIL">
@@ -1295,4 +1295,4 @@ IF %25buildenv: =%25==ReleasePortable ("$(SolutionDir)Tools\build-relport.cmd")<
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Geckofx45.45.0.20\build\Geckofx45.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx45.45.0.20\build\Geckofx45.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config
index 28d8535fb..48a230b7c 100644
--- a/mRemoteV1/packages.config
+++ b/mRemoteV1/packages.config
@@ -4,4 +4,4 @@
   <package id="DockPanelSuite" version="2.10.0" targetFramework="net40" />
   <package id="DockPanelSuite.ThemeVS2012Light" version="2.10.0" targetFramework="net40" />
   <package id="Geckofx45" version="45.0.20" targetFramework="net40" />
-</packages>
+</packages>
\ No newline at end of file