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