Fix Nuget.config

dotnet · Oct 18, 2023 · 97ecd86 · 97ecd86
1 parent 8306e5d
commit 97ecd86
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -4,17 +4,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-<<<<<<< HEAD
-    <add key="darc-int-dotnet-efcore-f16e454" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f16e454a/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-3bcb9f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3bcb9f24/nuget/v3/index.json" />
-=======
     <add key="darc-int-dotnet-efcore-c20ecc7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-c20ecc79/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-4a824ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3/nuget/v3/index.json" />
->>>>>>> v7.0.12
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -33,17 +26,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-<<<<<<< HEAD
-    <add key="darc-int-dotnet-efcore-f16e454" value="true" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-3bcb9f2" value="true" />
-=======
     <add key="darc-int-dotnet-efcore-c20ecc7" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-4a824ef" value="true" />
->>>>>>> v7.0.12
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>