[AFP-Inf] 👷 Fixes deployment.yaml merge conflicts [@earndt]

474e12ba · earndt · 6530433e · 474e12ba
Commit 474e12ba authored May 17, 2021 by earndt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

deployment.yaml deployment.yaml +0 -4

No files found.
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -38,10 +38,6 @@ spec:
  type: LoadBalancer
  ports:
  - port: 8086
-<<<<<<< HEAD
    targetPort: 8084
-=======
-    targetPort: 8080
->>>>>>> Kafka deployment test
  selector:
    app: afp-order-management-backend
\ No newline at end of file