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