Skip to content

Commit 97ecd86

Browse files
committed
Fix Nuget.config
1 parent 8306e5d commit 97ecd86

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

NuGet.config

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<<<<<<< HEAD
8-
<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" />
9-
<!-- End: Package sources from dotnet-efcore -->
10-
<!-- Begin: Package sources from dotnet-runtime -->
11-
<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" />
12-
=======
137
<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" />
148
<!-- End: Package sources from dotnet-efcore -->
159
<!-- Begin: Package sources from dotnet-runtime -->
1610
<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" />
17-
>>>>>>> v7.0.12
1811
<!-- End: Package sources from dotnet-runtime -->
1912
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2013
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -33,17 +26,10 @@
3326
<clear />
3427
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3528
<!-- Begin: Package sources from dotnet-efcore -->
36-
<<<<<<< HEAD
37-
<add key="darc-int-dotnet-efcore-f16e454" value="true" />
38-
<!-- End: Package sources from dotnet-efcore -->
39-
<!-- Begin: Package sources from dotnet-runtime -->
40-
<add key="darc-int-dotnet-runtime-3bcb9f2" value="true" />
41-
=======
4229
<add key="darc-int-dotnet-efcore-c20ecc7" value="true" />
4330
<!-- End: Package sources from dotnet-efcore -->
4431
<!-- Begin: Package sources from dotnet-runtime -->
4532
<add key="darc-int-dotnet-runtime-4a824ef" value="true" />
46-
>>>>>>> v7.0.12
4733
<!-- End: Package sources from dotnet-runtime -->
4834
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4935
</disabledPackageSources>

0 commit comments

Comments
 (0)