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