fix sln conflict 2

2 years ago · 48b64facc2
parent 0ca871a1db
commit 48b64facc2
1 changed files with 1 additions and 9 deletions
--- a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
+++ b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
@ -19,17 +19,9 @@
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
  </ItemGroup>
-<<<<<<< HEAD
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Model\Model.csproj" />
-  </ItemGroup>
-
-</Project>
-=======
  <ItemGroup>
    <ProjectReference Include="..\..\Model\Model.csproj" />
    <ProjectReference Include="..\..\DataPersistence\DataPersistence.csproj" />
  </ItemGroup>
 </Project>
->>>>>>> dev
+