# Conflicts: # test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json |
||
|---|---|---|
| .. | ||
| FrameFeatureCollection.cs | ||
| KnownHeaders.cs | ||
| Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj | ||
| Program.cs | ||
| project.json | ||
# Conflicts: # test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json |
||
|---|---|---|
| .. | ||
| FrameFeatureCollection.cs | ||
| KnownHeaders.cs | ||
| Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj | ||
| Program.cs | ||
| project.json | ||