Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
Files
4+ 35
− 30
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -52,29 +51,31 @@ gradlew-bootJar:
@@ -91,30 +92,33 @@ verification-unit:
@@ -123,8 +127,8 @@ docker-push:
@@ -136,7 +140,8 @@ deploy-bioinformatika.pef.mendelu.cz: