From e083ae105301e25345973a32ef3b753a1e26711c Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 19 Mar 2025 22:11:49 +0000
Subject: [PATCH] Remove blank lines from user_settings.h files

Co-Authored-By: Anthony H <anthony@wolfssl.com>
---
 IDE/AURIX/user_settings.h           | 1 -
 IDE/Android/user_settings.h         | 1 -
 IDE/CRYPTOCELL/user_settings.h      | 2 --
 IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c | 4 ----
 4 files changed, 8 deletions(-)

diff --git a/IDE/AURIX/user_settings.h b/IDE/AURIX/user_settings.h
index e5ba431a2..017b59297 100644
--- 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
diff --git a/IDE/Android/user_settings.h b/IDE/Android/user_settings.h
index 492b2b234..e65981b20 100644
--- 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
diff --git a/IDE/CRYPTOCELL/user_settings.h b/IDE/CRYPTOCELL/user_settings.h
index f91fd92bc..df5d23b98 100644
--- 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
 
diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c
index 3461302a8..73a29a689 100644
--- 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,