HPCC-30994 Remove mismerge content.

Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Dec 11, 2023 · 2e69068 · 2e69068
1 parent 794fd18
commit 2e69068
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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();