From 8760b72426b6c45e9b80039620284daebc8de2ec Mon Sep 17 00:00:00 2001
From: night1rider <backman23@live.com>
Date: Fri, 3 Apr 2026 15:24:36 -0600
Subject: [PATCH] Add missing NO_WC_SHE_LOADKEY macro to known macros list

---
 .wolfssl_known_macro_extras | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 67c2947374..aacdf074dd 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -661,8 +661,6 @@ WC_RSA_NONBLOCK
 WC_RSA_NONBLOCK_TIME
 WC_RSA_NO_FERMAT_CHECK
 WC_RWLOCK_OPS_INLINE
-<<<<<<< HEAD
-=======
 WC_SHA384
 WC_SHA384_DIGEST_SIZE
 WC_SHA512
@@ -676,7 +674,6 @@ WC_SHE_SW_TEST_EXP_M3
 WC_SHE_SW_TEST_EXP_M4
 WC_SHE_SW_TEST_EXP_M5
 WC_SHE_SW_TEST_NEW_KEY
->>>>>>> 68515713f0 (Address comments from bigbrett and Fenrir bot. Rename she.{c,h} to wc_she.{c,h}, fix naming consistency, auto-enable CMAC/AES dependencies, add WC_SHE_SW_DEFAULT opt-inAddress PR #10009 review comments from bigbrett and Fenrir)
 WC_SKIP_INCLUDED_C_FILES
 WC_SSIZE_TYPE
 WC_STRICT_SIG