Skip to content

Commit 3e9dcab

Browse files
committed
[fix] post-merge
1 parent 5923524 commit 3e9dcab

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@
88
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<<<<<<< HEAD
12-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.*" />
13-
=======
1411
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1512
</ItemGroup>
1613
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.10" />
18-
>>>>>>> bugfix/#174
14+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.*" />
1915
<PackageReference Include="System.Text.Json" Version="4.7.2" />
2016
</ItemGroup>
2117
<ItemGroup>

0 commit comments

Comments
 (0)