correect pull conflicts

movementlabsxyz · Jul 4, 2024 · 7b13f6a · 7b13f6a
2 parents fbc86ea + 8fc02d8
commit 7b13f6a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/process-compose/suzuka-full-node/process-compose.load.yml b/process-compose/suzuka-full-node/process-compose.load.yml
@@ -13,8 +13,5 @@ processes:
  suzuka-faucet:
  condition: process_healthy
  availability:
-<<<<<<< HEAD
- exit_on_end: false
-=======
  exit_on_end: true
->>>>>>> 186a4994 (recreate the PR to remove unknown modifications)
+