Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
+ 44
− 29
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -53,17 +50,31 @@ gradlew-bootJar:
@@ -80,30 +91,33 @@ verification-unit:
@@ -112,8 +126,8 @@ docker-push:
@@ -125,7 +139,8 @@ deploy-bioinformatika.pef.mendelu.cz: