Skip to content

Commit aa190aa

Browse files
committed
Fix bad merge
1 parent 142492e commit aa190aa

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/TestableHttpClient/TestableHttpClient.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@
3939
<PackageReference Include="PolyKit.Embedded" Version="3.0.9" />
4040
</ItemGroup>
4141

42-
<<<<<<< HEAD
43-
=======
44-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
45-
<PackageReference Include="Perfors.UnreachableException" Version="1.0.0" />
46-
<PackageReference Include="PolyKit.Embedded" Version="3.0.9" />
47-
</ItemGroup>
48-
49-
>>>>>>> b3a5f8e (Add IsAny property to value.)
5042
<ItemGroup>
5143
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
5244
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All">

0 commit comments

Comments
 (0)