Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
+ 5
− 6
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:
@@ -61,7 +60,7 @@ docker-build-latest:
@@ -73,7 +72,7 @@ docker-build-tag:
@@ -106,7 +105,7 @@ docker-push-latest:
@@ -118,7 +117,7 @@ docker-push-tag: