remove conflict indicator ...
authorBodo Möller <bodo@openssl.org>
Fri, 4 Jun 1999 21:52:12 +0000 (21:52 +0000)
committerBodo Möller <bodo@openssl.org>
Fri, 4 Jun 1999 21:52:12 +0000 (21:52 +0000)
CHANGES

diff --git a/CHANGES b/CHANGES
index 3f425a3..ae84736 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]