From: Bodo Möller <bodo@openssl.org>
Date: Fri, 4 Jun 1999 21:52:12 +0000 (+0000)
Subject: remove conflict indicator ...
X-Git-Tag: OpenSSL_0_9_4~251
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af258e0deca2e40b694f433c2be3de34b60908bd;p=oweals%2Fopenssl.git

remove conflict indicator ...
---

diff --git a/CHANGES b/CHANGES
index 3f425a3b95..ae847366a4 100644
--- 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]