diff options
| author | kris <kris@FreeBSD.org> | 2000-04-13 07:15:03 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-04-13 07:15:03 +0000 |
| commit | 6b5aa791691598fc101d47b4b016e597d4e604c4 (patch) | |
| tree | 6c76d880ce419c2a70941c0634805027ea31fc80 /crypto/openssl/rsaref/rsar_err.c | |
| parent | 254febffb998a2a1fd6e6be57dcb73d57335fa14 (diff) | |
| download | FreeBSD-src-6b5aa791691598fc101d47b4b016e597d4e604c4.zip FreeBSD-src-6b5aa791691598fc101d47b4b016e597d4e604c4.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssl/rsaref/rsar_err.c')
| -rw-r--r-- | crypto/openssl/rsaref/rsar_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/rsaref/rsar_err.c b/crypto/openssl/rsaref/rsar_err.c index 438acf5..ba7b605 100644 --- a/crypto/openssl/rsaref/rsar_err.c +++ b/crypto/openssl/rsaref/rsar_err.c @@ -55,7 +55,8 @@ */ /* NOTE: this file was auto generated by the mkerr.pl script: any changes - * made to it will be overwritten when the script next updates this file. + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. */ #include <stdio.h> |
