README: rm merge conflict code

This commit is contained in:
terrafrost 2018-01-30 00:45:27 -06:00
parent 489627f803
commit 7ed7ff2277

View File

@ -7,7 +7,6 @@ arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
* [Browse Git](https://github.com/phpseclib/phpseclib)
<<<<<<< HEAD
* [Code Coverage Report](https://coverage.phpseclib.org/master/latest/)
## Documentation