Resolve conflicts

Apply dokan-dev#4
sshirokov · Aug 17, 2016 · af3e632 · af3e632
2 parents 658fa6c + 6e5bca4
commit af3e632
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/DokanSSHFS/DokanSSHFS.csproj b/DokanSSHFS/DokanSSHFS.csproj
@@ -78,6 +78,14 @@
       <HintPath>packages\DokanNet.1.1.0-rc3\lib\net40\DokanNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="DiffieHellman, Version=0.0.0.0, Culture=neutral">
+      <HintPath>packages\DiffieHellman.1.0.0\lib\net40\DiffieHellman.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Org.Mentalis.Security, Version=1.0.13.715, Culture=neutral">
+      <HintPath>packages\Org.Mentalis.Security.1.0.0\lib\net40\Org.Mentalis.Security.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />

diff --git a/DokanSSHFS/packages.config b/DokanSSHFS/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DokanNet" version="1.1.0-rc3" targetFramework="net40" />
+  <package id="DiffieHellman" version="1.0.0" targetFramework="net4" />
+  <package id="Org.Mentalis.Security" version="1.0.0" targetFramework="net4" />
   <package id="Tamir.SharpSSH" version="1.1.1.13" targetFramework="net35" />
 </packages>