fix: merge conflict

chainbound · Oct 28, 2024 · d52fb5a · d52fb5a
1 parent 4d307f4
commit d52fb5a
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/testnets/holesky/docker-compose.yml b/testnets/holesky/docker-compose.yml
@@ -10,23 +10,17 @@ services:
     env_file: ./bolt-sidecar.env
     volumes:
       - "./delegations.json:${BOLT_SIDECAR_DELEGATIONS_PATH:-/etc/delegations.json}"
-<<<<<<< HEAD
-=======
     networks:
       - bolt-default
->>>>>>> 3840e243e44505dec9e4fcdee4f61abd567676a8
 
   bolt-mev-boost-holesky:
     image: ghcr.io/chainbound/bolt-mev-boost:v0.3.0-alpha.rc1
     container_name: bolt-mev-boost-holesky
     restart: unless-stopped
     env_file: ./mev-boost.env
     entrypoint: /bin/sh -c '/app/mev-boost'
-<<<<<<< HEAD
-=======
     networks:
       - bolt-default
->>>>>>> 3840e243e44505dec9e4fcdee4f61abd567676a8
 
   bolt-prometheus-holesky:
     image: prom/prometheus:latest
@@ -37,11 +31,8 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - ./targets.json:/etc/prometheus/targets.json
       - prometheus-data:/prometheus
-<<<<<<< HEAD
-=======
     networks:
       - bolt-default
->>>>>>> 3840e243e44505dec9e4fcdee4f61abd567676a8
 
   bolt-cadvisor-holesky:
     image: gcr.io/cadvisor/cadvisor:latest