summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-04-21 17:46:23 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-04-21 17:46:23 +0000
commit4cd401e401c4526768f0ca9257129e749431b384 (patch)
treed2697e634bba356bc10c1b9dbae4b77b260cad52
parentd943e3724162cb7668b90a34f689e7c2b89ebc64 (diff)
Oops! Fixup CHANGES.
-rw-r--r--CHANGES1
1 files changed, 0 insertions, 1 deletions
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]