Merge branch 'main' into #1-CI/CD_Integration

# Conflicts: # build.gradle.kts # src/main/resources/template-map.json
valantic-CEC-Deutschland-GmbH · Jul 8, 2022 · 46cdf5a · 46cdf5a
2 parents 4401738 + abfc897
commit 46cdf5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ build
 .ssl-keys/chain.crt
 .ssl-keys/password.txt
 .ssl-keys/private.pem
+src/main/resources/template-map.json
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -113,7 +113,7 @@ tasks {
 
     runIde {
         jvmArgs("-Xmx2024m", "-Xms512m", "-XX:MaxPermSize=500m", "-ea")
-        // ideDir.set(file(properties("platformIdeDir")))
+        //ideDir.set(file(properties("platformIdeDir")))
     }
 
     // Configure UI tests plugin