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