Draft: Resolve "Extrahovat Gateway z projketu dna-analyser"
- Jan Kolomazník authored
Auto stash before merge of "1-extrahovat-gateway-z-projketu-dna-analyser" and "origin/1-extrahovat-gateway-z-projketu-dna-analyser"
+ 10
− 2
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -35,14 +42,15 @@ code_quality_json: