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