Merge master

ethpandaops · Apr 26, 2024 · a3aabb7 · a3aabb7
1 parent 80e686d
commit a3aabb7
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/deploy/local/docker-compose/vector-kafka-clickhouse.yaml b/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
@@ -3608,7 +3608,6 @@ sinks:
     healthcheck:
       enabled: true
     skip_unknown_fields: false
-<<<<<<< HEAD
   libp2p_trace_gossipsub_beacon_block_clickhouse:
     type: clickhouse
     inputs:
@@ -3629,5 +3628,3 @@ sinks:
     healthcheck:
       enabled: true
     skip_unknown_fields: false
-=======
->>>>>>> master