From 1e2f3ed08f4fc5dacda67ea3923fa1a68b8a08d2 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Tue, 18 Dec 2018 18:30:03 +0000 Subject: [PATCH] Remove merge artifact --- include/mbedtls/camellia.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/mbedtls/camellia.h b/include/mbedtls/camellia.h index 41e17f111e..57bb39e8bd 100644 --- a/include/mbedtls/camellia.h +++ b/include/mbedtls/camellia.h @@ -45,9 +45,6 @@ #define MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH -0x0026 /**< Invalid data input length. */ -/** TEMPORARY -- THIS IS IN CONFLICT WITH EXISTING ERROR CODES AND NEEDS CHANGE. */ -#define MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA -0x0024 /**< Invalid data input length. */ - /* MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED is deprecated and should not be used. */ #define MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED -0x0027 /**< Camellia hardware accelerator failed. */