danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-27 04:46:26 +01:00
Code Issues Projects Releases Wiki Activity

RSA: fix bad merge

Browse Source
This commit is contained in:
terrafrost 2019-03-08 08:02:20 -06:00
parent 604954cd09
commit 4a920c3690
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/RSA.php
View File

@ -434,12 +434,8 @@ class RSA extends AsymmetricKey
* @return bool
* @access public
* @param string|RSA|array $key
<<<<<<< HEAD
* @param int|bool $type optional
=======
* @param bool|int $type optional
* @return bool
>>>>>>> 2.0
*/
public function load($key, $type = false)
{