Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
Files
4+ 48
− 35
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -54,18 +48,34 @@ gradlew-bootJar:
@@ -82,30 +92,32 @@ verification-unit:
@@ -114,8 +126,8 @@ docker-push:
@@ -127,7 +139,8 @@ deploy-bioinformatika.pef.mendelu.cz: