octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-26 00:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests/RSA: fix bad merge

Browse Source
This commit is contained in:
terrafrost 2016-04-03 22:07:49 -05:00
parent 9cf93a02b3
commit 383bceb1a9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/Crypt/RSA/LoadKeyTest.php
View File

@ -350,7 +350,6 @@ Z2sKniRCcDT1ZP4=
$this->assertTrue($result); $this->assertTrue($result);
} }
<<<<<<< HEAD
public function testPKCS1EncryptionChange() public function testPKCS1EncryptionChange()
{ {
$rsa = new RSA(); $rsa = new RSA();
@ -536,3 +535,4 @@ Private-MAC: 35134b7434bf828b21404099861d455e660e8740';
$rsa->load($rsa); $rsa->load($rsa);
} }
} }