From 9e7efc914df6d745fea37871ae7ebb0823a97aa0 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@gmail.com>
Date: Tue, 16 Aug 2022 19:38:23 -0500
Subject: [PATCH] fix bad merge

---
 phpseclib/Net/SSH2.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index be492431..7dd2010e 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -3988,7 +3988,6 @@ class SSH2
      */
     protected function append_log_helper(int $constant, string $message_number, string $message, array &$message_number_log, array &$message_log, int &$log_size, &$realtime_log_file, bool &$realtime_log_wrap, int &$realtime_log_size)
     {
->>>>>>> 3.0
         // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
         if (strlen($message_number) > 2) {
             Strings::shift($message);