Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
Files
4+ 8
− 5
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -4,8 +4,7 @@ variables:
@@ -60,6 +59,8 @@ docker-build-latest:
@@ -70,6 +71,8 @@ docker-build-tag:
@@ -102,9 +105,9 @@ docker-push-latest:
@@ -114,7 +117,7 @@ docker-push-tag: