From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 5 Aug 2009 15:32:10 +0000 (+0000)
Subject: Oops!
X-Git-Tag: OpenSSL-fips-2_0-rc1~1575
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=bc32dbbea9a5b8eb813cbc76368ceaafe2bcaeed;hp=f10f4447dad668df53d9df65beaa2885f61bc9aa;ds=sidebyside

Oops!
---

diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index d86f70b471..b17eb9f42b 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -230,11 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
 		   const EVP_MD *md_type);
 int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
 					 int saltlen, const EVP_MD *md_type);
-<<<<<<< pkcs12.h
-=======
 unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
 char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
->>>>>>> 1.44
 
 DECLARE_ASN1_FUNCTIONS(PKCS12)
 DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)