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