Fixup bad merge in the captive core config

Shaptic · Jan 5, 2024 · 21f9614 · 21f9614
1 parent 5691d2f
commit 21f9614
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/services/horizon/internal/configs/captive-core-pubnet.cfg b/services/horizon/internal/configs/captive-core-pubnet.cfg
@@ -1,14 +1,12 @@
-<<<<<<<< HEAD:exp/lighthorizon/build/ledgerexporter/captive-core-pubnet.cfg
 PEER_PORT=11725
 DATABASE = "sqlite3:///cc/stellar.db"
 
 FAILURE_SAFETY=1
-========
+
 # WARNING! Do not use this config in production. Quorum sets should
 # be carefully selected manually.
 NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
 HTTP_PORT=11626
->>>>>>>> master:services/horizon/internal/configs/captive-core-pubnet.cfg
 
 [[HOME_DOMAINS]]
 HOME_DOMAIN="stellar.org"