Fix merging issues & API changes - that conflict resolution did not detect

2016-04-23 11:06:10 +01:00
parent bfe134ee54
commit 6fdbb2b659
4 changed files with 4 additions and 3 deletions
@@ -45,6 +45,7 @@
    </Reference>
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
+    </Reference>
    <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\DotNet4.SocksProxy.1.0.0.0\lib\net40\Org.Mentalis.dll</HintPath>
      <Private>True</Private>