From 2b427eb02ab789536fcd3da6bb96ad1eef3d3ec1 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Mon, 12 Oct 2015 14:21:22 -0500
Subject: [PATCH] fix merge issues

---
 phpseclib/Crypt/RSA.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index f6913d3f..57fc9539 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -166,7 +166,6 @@ class RSA
     const MODE_OPENSSL = 2;
     /**#@-*/
 
-<<<<<<< HEAD
     /**#@+
      * @access public
      * @see \phpseclib\Crypt\RSA::createKey()