Remove blank lines from user_settings.h files

Co-Authored-By: Anthony H <anthony@wolfssl.com>
2025-03-19 22:11:49 +00:00
parent 3a5b7c72cd
commit e083ae1053
4 changed files with 0 additions and 8 deletions
--- a/IDE/AURIX/user_settings.h
+++ b/IDE/AURIX/user_settings.h
@@ -446,7 +446,6 @@ extern unsigned int my_rng_seed_gen(void);
 #define NO_PSK

 #define NO_DSA
-
 #define NO_MD4
 #define NO_PWDBASED
 //#define NO_CODING
--- a/IDE/Android/user_settings.h
+++ b/IDE/Android/user_settings.h
@@ -121,7 +121,6 @@
 #define HAVE_CRL

 #define NO_DSA
-
 #define NO_PSK
 #define WOLFSSL_NO_SHAKE256
 #define NO_MD4
--- a/IDE/CRYPTOCELL/user_settings.h
+++ b/IDE/CRYPTOCELL/user_settings.h
@@ -552,8 +552,6 @@ extern "C" {
 #undef  NO_DSA
 #define NO_DSA

-
-
 #undef  NO_OLD_TLS
 #define NO_OLD_TLS

--- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c
+++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c
@@ -253,10 +253,6 @@ static struct {
  "hmac_sha384",  hmac_sha384_test,
  #endif
 #endif
-<<<<<<< HEAD
-=======
-
->>>>>>> ed6cc3fea (Remove all references to arc4/rc4 from IDE directory files)
 #ifndef NO_DES3
  "des",  des_test,
  "des3",  des3_test,