commit 1e5e819d312208452c511853096bccb20b0274cc
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Mar 20 17:43:37 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Mar 20 17:46:17 2015 +0000
tree 8a6903ce10b26b63f2a1f03ad1b2a720e45e569b
parent 7c4e60fa7d54f0356307c014e6aefbfda1dca8c8

Fix forgotten merge conflict

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 35e181c..5aa26d4 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1817,24 +1817,6 @@
 #define POLARSSL_PADLOCK_C
 
 /**
-<<<<<<< HEAD:include/mbedtls/config.h
-=======
- * \def POLARSSL_PBKDF2_C
- *
- * Enable PKCS#5 PBKDF2 key derivation function.
- *
- * \deprecated Use POLARSSL_PKCS5_C instead
- *
- * Module:  library/pbkdf2.c
- *
- * Requires: POLARSSL_PKCS5_C
- *
- * This module adds support for the PKCS#5 PBKDF2 key derivation function.
- */
-#define POLARSSL_PBKDF2_C
-
-/**
->>>>>>> mbedtls-1.3:include/polarssl/config.h
  * \def POLARSSL_PEM_PARSE_C
  *
  * Enable PEM decoding / parsing.