fix

1 year ago · 4343f98f2f
parent ada4790aa6
commit 4343f98f2f
2 changed files with 0 additions and 5 deletions
--- a/Project/EntityFramework/TU/TU_API.csproj
+++ b/Project/EntityFramework/TU/TU_API.csproj
@ -21,7 +21,6 @@
  <ItemGroup>
    <ProjectReference Include="..\API\API.csproj" />
    <ProjectReference Include="..\DbContext\DbContextLib.csproj" />
-    <ProjectReference Include="..\StubbedContext\StubbedContextLib.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/Project/EntityFramework/TU/TranslateTU.cs
+++ b/Project/EntityFramework/TU/TranslateTU.cs
@ -147,9 +147,5 @@ namespace TU
            }
        }

-<<<<<<< HEAD
-   
-=======
->>>>>>> master
    }
 }