From: Richard Levitte <levitte@openssl.org>
Date: Wed, 2 May 2001 07:15:03 +0000 (+0000)
Subject: Remove part conflict indicator...
X-Git-Tag: OpenSSL_0_9_6c~182^2~207
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d02408ad8a2c277feee1d43d34b8d140abc71263;p=oweals%2Fopenssl.git

Remove part conflict indicator...
---

diff --git a/CHANGES b/CHANGES
index 15a9c155fc..10d4a47d2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -114,7 +114,6 @@
      that they do not hold after the first thread unsets add_do_not_lock).
      [Bodo Moeller]
 
->>>>>>> 1.823
   +) Implement binary inversion algorithm for BN_mod_inverse in addition
      to the algorithm using long divison.  The binary algorithm can be
      used only if the modulus is odd.  On 32-bit systems, it is faster