danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-12 09:09:39 +01:00
Code Issues Projects Releases Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
terrafrost 2015-10-12 14:21:22 -05:00
parent 33ea01f1ac
commit 2b427eb02a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpseclib/Crypt/RSA.php
View File

@ -166,7 +166,6 @@ class RSA
const MODE_OPENSSL = 2; const MODE_OPENSSL = 2;
/**#@-*/ /**#@-*/
<<<<<<< HEAD
/**#@+ /**#@+
* @access public * @access public
* @see \phpseclib\Crypt\RSA::createKey() * @see \phpseclib\Crypt\RSA::createKey()