Fix merge error with libcrypto.num

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12929)

diff --git a/util/libcrypto.num b/util/libcrypto.num
index e414a6443b144d031f07eb233524c273dcb24007..3658d14c2940d527cae0e8b7ea3efcea0c501537 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5312,4 +5312,3 @@ OSSL_ENCODER_CTX_set_cleanup            ? 3_0_0   EXIST::FUNCTION:
 OSSL_DECODER_INSTANCE_get_input_type    ?      3_0_0   EXIST::FUNCTION:
 OSSL_ENCODER_CTX_set_passphrase_cb      ?      3_0_0   EXIST::FUNCTION:
 EVP_PKEY_typenames_do_all               ?      3_0_0   EXIST::FUNCTION:
-OSSL_DECODER_INSTANCE_get_input_type    ?      3_0_0   EXIST::FUNCTION: