From 676c1982c77b3ce57dd82fe886a4304a92309d76 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Thu, 4 Aug 2016 00:59:07 -0500
Subject: [PATCH] fix bad merge

---
 phpseclib/Crypt/RSA.php | 4 ++--
 phpseclib/File/X509.php | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index 0428b6ce..ef508a43 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -245,7 +245,7 @@ class RSA
     /**
      * Precomputed Zero
      *
-     * @var array
+     * @var \phpseclib\Math\BigInteger
      * @access private
      */
     var $zero;
@@ -253,7 +253,7 @@ class RSA
     /**
      * Precomputed One
      *
-     * @var array
+     * @var \phpseclib\Math\BigInteger
      * @access private
      */
     var $one;
diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php
index c19ade04..863d9e99 100644
--- a/phpseclib/File/X509.php
+++ b/phpseclib/File/X509.php
@@ -244,11 +244,7 @@ class X509
     /**
      * The signature subject
      *
-<<<<<<< HEAD
-     * There's no guarantee \phpseclib\File\X509 is going to reencode an X.509 cert in the same way it was originally
-=======
-     * There's no guarantee File_X509 is going to re-encode an X.509 cert in the same way it was originally
->>>>>>> 1.0
+     * There's no guarantee \phpseclib\File\X509 is going to re-encode an X.509 cert in the same way it was originally
      * encoded so we take save the portion of the original cert that the signature would have made for.
      *
      * @var string