From d38c7a5aa9e3e0d7cceedb9aa9f374d58181c883 Mon Sep 17 00:00:00 2001
From: matthewkeil <me@matthewkeil.com>
Date: Wed, 23 Aug 2023 18:24:46 -0400
Subject: [PATCH] fix: update bad merge conflict resolution

---
 packages/beacon-node/src/network/options.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/beacon-node/src/network/options.ts b/packages/beacon-node/src/network/options.ts
index b069e789b3ad..b490e3c7206d 100644
--- a/packages/beacon-node/src/network/options.ts
+++ b/packages/beacon-node/src/network/options.ts
@@ -35,7 +35,7 @@ export const defaultNetworkOptions: NetworkOptions = {
   useWorker: true,
   // default set via research in https://github.com/ChainSafe/lodestar/issues/2115
   maxYoungGenerationSizeMb: 152,
-  // subscribe to 2 subnets per node
+  // subscribe to 2 subnets per node since v1.10
   deterministicLongLivedAttnets: true,
   // subscribe 2 slots before aggregator dutied slot to get stable mesh peers as monitored on goerli
   slotsToSubscribeBeforeAggregatorDuty: 2,