fixed project errors due to wrong merge

nstoredev · Apr 24, 2019 · 5b9de0c · 5b9de0c
1 parent 13bed5c
commit 5b9de0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,3 +1,7 @@
+## 0.8.2
+
+- Fix wrong merge.
+
 ## 0.8.1
 
 - Updated mongodb Driver 

diff --git a/src/NStore.Persistence.MsSql.Tests/NStore.Persistence.MsSql.Tests.csproj b/src/NStore.Persistence.MsSql.Tests/NStore.Persistence.MsSql.Tests.csproj
@@ -26,12 +26,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
-<<<<<<< Updated upstream
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-=======
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
->>>>>>> Stashed changes
+
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 </Project>
diff --git a/src/NStore.Persistence.Sqlite.Tests/NStore.Persistence.Sqlite.Tests.csproj b/src/NStore.Persistence.Sqlite.Tests/NStore.Persistence.Sqlite.Tests.csproj
@@ -28,12 +28,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
-<<<<<<< Updated upstream
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-=======
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
->>>>>>> Stashed changes
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 </Project>