Fixup bad merge in the captive core config

.github/workflows/horizon.yml

@@ -160,7 +160,7 @@ jobs:
         run: docker push stellar/horizon-verify-range:latest
 
   horizon-light:
-    name: Test and Push the horizon light images
+    name: Test and push the Horizon Light (Zenith) images
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

services/horizon/internal/configs/captive-core-pubnet.cfg

@@ -1,14 +1,9 @@
-<<<<<<<< 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"
+FAILURE_SAFETY=1
 HTTP_PORT=11626
->>>>>>>> master:services/horizon/internal/configs/captive-core-pubnet.cfg
+PEER_PORT=11725
 
 [[HOME_DOMAINS]]
 HOME_DOMAIN="stellar.org"
@@ -193,16 +188,8 @@ ADDRESS = "stellar2.franklintempleton.com:11625"
 HISTORY = "curl -sf https://stellar-history-usc.franklintempleton.com/azuscshf401/{0} -o {1}"
 
 [[VALIDATORS]]
-<<<<<<<< HEAD:exp/lighthorizon/build/ledgerexporter/captive-core-pubnet.cfg
-NAME="wirexSG"
-ADDRESS="sg.stellar.wirexapp.com"
-HOME_DOMAIN="wirexapp.com"
-PUBLIC_KEY="GAB3GZIE6XAYWXGZUDM4GMFFLJBFMLE2JDPUCWUZXMOMT3NHXDHEWXAS"
-HISTORY="curl -sf http://wxhorizonasiastga1.blob.core.windows.net/history/{0} -o {1}"
-========
 NAME = "FT_SCV_3"
 HOME_DOMAIN = "www.franklintempleton.com"
 PUBLIC_KEY = "GA7DV63PBUUWNUFAF4GAZVXU2OZMYRATDLKTC7VTCG7AU4XUPN5VRX4A"
 ADDRESS = "stellar3.franklintempleton.com:11625"
 HISTORY = "curl -sf https://stellar-history-ins.franklintempleton.com/azinsshf401/{0} -o {1}"
->>>>>>>> master:services/horizon/internal/configs/captive-core-pubnet.cfg