summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2012-06-11 23:23:27 (GMT)
committerScott MacVicar <scottmac@php.net>2012-06-11 23:23:27 (GMT)
commit5b3c9f4fd1fbaa251beea37ff7870f6523320672 (patch)
treea5733fdf3a01887ec73b9607058192caf1871ad2
parentbcd671d999bcb9aac3691c59e632d91575ea87a0 (diff)
downloadphp-5b3c9f4fd1fbaa251beea37ff7870f6523320672.tar.gz
One more time
-rw-r--r--ext/openssl/openssl.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index d0ed15e..938e0e1 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3328,10 +3328,7 @@ PHP_FUNCTION(openssl_pkey_get_details)
/* }}} */
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-<<<<<<< HEAD
-=======
->>>>>>> 5.4
/* {{{ proto string openssl_pbkdf2(string password, string salt, long key_length, long iterations [, string digest_method = "sha1"])
Generates a PKCS5 v2 PBKDF2 string, defaults to sha1 */
PHP_FUNCTION(openssl_pbkdf2)