From 4cd401e401c4526768f0ca9257129e749431b384 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 21 Apr 1999 17:46:23 +0000
Subject: [PATCH] Oops! Fixup CHANGES.

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

diff --git a/CHANGES b/CHANGES
index 9b5fc0d89e..403ec97d5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,7 +27,6 @@
   *) Fix problems with sizeof(long) == 8.
      [Andy Polyakov <appro@fy.chalmers.se>]
 
->>>>>>> 1.185
   *) Change functions to ANSI C.
      [Ulf Möller]
 
-- 
2.25.1