diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-06-04 21:52:12 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-06-04 21:52:12 +0000 |
| commit | af258e0deca2e40b694f433c2be3de34b60908bd (patch) | |
| tree | 493c435210ce94d04e9005f6ef8dc9bd60ac2760 /CHANGES | |
| parent | 1ec7ac3ce7f53c22f1c5b65cc2be1852f98368d7 (diff) | |
remove conflict indicator ...
Diffstat (limited to 'CHANGES')
| -rw-r--r-- | CHANGES | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -18,7 +18,6 @@ *) Support BS2000/OSD-POSIX. [Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>] ->>>>>>> 1.252 *) Make callbacks for key generation use void * instead of char *. [Ben Laurie] |