From 1e5e819d312208452c511853096bccb20b0274cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Fri, 20 Mar 2015 17:43:37 +0000
Subject: [PATCH] Fix forgotten merge conflict

---
 include/mbedtls/config.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 35e181cf1..5aa26d4ca 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.