Skip to content

Commit 36878e5

Browse files
committed
fix bad merge
1 parent fd8f822 commit 36878e5

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@
255255
BaseRegistry="$(ContainerBaseRegistry)"
256256
BaseImageName="$(ContainerBaseName)"
257257
BaseImageTag="$(ContainerBaseTag)"
258-
ImageFormat="$(ContainerImageFormat)"
259258
BaseImageDigest="$(ContainerBaseDigest)"
260259
ImageFormat="$(ContainerImageFormat)"
261260
LocalRegistry="$(LocalRegistry)"

0 commit comments

Comments
 (0)