Fix merge conflict

Gepardgame · Gepardgame · commit 61af2c1089d0 · 2024-09-10T13:06:23.000+02:00
Signed-off-by: Thomas Schauer-Köckeis &lt;thomas.schauer-koeckeis@rohde-schwarz.com&gt;
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:313aa0507d49c4e76b9f3ba43012688c8bf2af40e1a32024adeabaf06484a89f
+FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:16f6d3e75e8e00832788c9e3d52fd00b29d363df1858d1906348752b539cd944
 
 # Arguments that can be passed at build time
 ARG COMMIT_SHA=unknown

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:313aa0507d49c4e76b9f3ba43012688c8bf2af40e1a32024adeabaf06484a89f`
	`1`	`+FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:16f6d3e75e8e00832788c9e3d52fd00b29d363df1858d1906348752b539cd944`
`2`	`2`
`3`	`3`	`# Arguments that can be passed at build time`
`4`	`4`	`ARG COMMIT_SHA=unknown`