From 68a09b8af04d94c28bfb786ff0dfa96f2fb2edfb Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Sat, 11 Jun 2016 19:38:23 -0500
Subject: [PATCH] SSH2: i incorrectly thought i had saved when i did git commit
 -a

---
 phpseclib/Net/SSH2.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index 397179c0..97a37a0b 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -1096,14 +1096,8 @@ class SSH2
             $this->errors[] = utf8_decode($data);
         }
 
-<<<<<<< HEAD
-        if ($matches[1] != '1.99' && $matches[1] != '2.0') {
-            throw new \RuntimeException("Cannot connect to SSH $matches[1] servers");
-=======
         if ($matches[3] != '1.99' && $matches[3] != '2.0') {
-            user_error("Cannot connect to SSH $matches[3] servers");
-            return false;
->>>>>>> 2.0
+            throw new \RuntimeException("Cannot connect to SSH $matches[1] servers");
         }
 
         fputs($this->fsock, $this->identifier . "\r\n");