mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-01 05:31:53 +00:00
fix bad merge
This commit is contained in:
parent
fd6e53719c
commit
9e7efc914d
@ -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)
|
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)
|
// remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
|
||||||
if (strlen($message_number) > 2) {
|
if (strlen($message_number) > 2) {
|
||||||
Strings::shift($message);
|
Strings::shift($message);
|
||||||
|
Loading…
Reference in New Issue
Block a user