Merge pull request #20 from quarkiverse/resolve_conflict

Resolve conflict
quarkiverse · Aug 9, 2024 · 5ab3617 · 5ab3617
2 parents 8ba4403 + d20a0ea
commit 5ab3617
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/integration-test/src/main/resources/application.properties b/integration-test/src/main/resources/application.properties
diff --git a/integration-tests/src/main/resources/application.properties b/integration-tests/src/main/resources/application.properties
@@ -1 +1,2 @@
+quarkus.http.port=8081
 quarkus.native.additional-build-args=--initialize-at-run-time=io.quarkiverse.temporal.it.client.TransferApp