Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
Files
4+ 49
− 30
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -54,15 +49,35 @@ gradlew-bootJar:
@@ -79,30 +94,33 @@ verification-unit:
@@ -111,8 +129,8 @@ docker-push:
@@ -124,7 +142,8 @@ deploy-bioinformatika.pef.mendelu.cz: