commit 1e2f3ed08f4fc5dacda67ea3923fa1a68b8a08d2
author Hanno Becker <hanno.becker@arm.com> Tue Dec 18 18:30:03 2018 +0000
committer Hanno Becker <hanno.becker@arm.com> Wed Dec 19 12:47:55 2018 +0000
tree a7a49505fffb563aef2250404f03f3921f1476af
parent bdb7cd4840ece5bf98e23ff208c9f02cb4af9613

Remove merge artifact

include/mbedtls/camellia.h

diff --git a/include/mbedtls/camellia.h b/include/mbedtls/camellia.h
index 41e17f1..57bb39e 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. */