octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
This commit is contained in:
terrafrost 2019-02-24 21:37:43 -06:00
commit adc9a5d189
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpseclib/Crypt/RSA.php
View File

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