From af258e0deca2e40b694f433c2be3de34b60908bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Fri, 4 Jun 1999 21:52:12 +0000
Subject: [PATCH] remove conflict indicator ...

---
 CHANGES | 1 -
 1 file changed, 1 deletion(-)

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]
 
-- 
2.25.1