Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
Files
5+ 49
− 22
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -48,11 +50,31 @@ gradlew-bootJar:
@@ -69,29 +91,33 @@ verification-unit:
@@ -100,8 +126,8 @@ publish:
@@ -113,7 +139,8 @@ deploy-bioinformatika.pef.mendelu.cz: