From 2e69068aa147c7d046fbd97a493e08c75befb202 Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@lexisnexisrisk.com>
Date: Mon, 11 Dec 2023 14:58:34 +0000
Subject: [PATCH] HPCC-30994 Remove mismerge content.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
---
 thorlcr/slave/thslavemain.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/thorlcr/slave/thslavemain.cpp b/thorlcr/slave/thslavemain.cpp
index 45916bf96f2..ded645d0e63 100644
--- a/thorlcr/slave/thslavemain.cpp
+++ b/thorlcr/slave/thslavemain.cpp
@@ -435,8 +435,6 @@ int main( int argc, const char *argv[]  )
 
         if (RegisterSelf(masterEp))
         {
-            if (globals->getPropBool("@MPChannelReconnect"))
-                getMPServer()->setOpt(mpsopt_channelreopen, "true");
             if (getExpertOptBool("slaveDaliClient"))
                 enableThorSlaveAsDaliClient();