Removed a merge-indicator from mbedtls_config_reader.h

dreemkiller · dreemkiller · commit 42af1df28f81 · 2019-02-21T11:34:02.000-06:00
diff --git a/features/mbedtls/platform/inc/mbedtls_config_reader.h b/features/mbedtls/platform/inc/mbedtls_config_reader.h
@@ -405,8 +405,6 @@
     #define MBEDTLS_SSL_SERVER_NAME_INDICATION
 #endif
 
-<<<<<<< HEAD
-=======
 #define MBED_TLS_HAVE_ASM
 #define MBED_TLS_HAVE_TIME
 #define MBEDTLS_ENTROPY_C
