Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
+ 10
− 8
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -4,12 +4,10 @@ variables:
@@ -61,9 +59,11 @@ docker-build-latest:
@@ -71,9 +71,11 @@ docker-build-tag:
@@ -103,9 +105,9 @@ docker-push-latest:
@@ -115,7 +117,7 @@ docker-push-tag: