Merge branch 'chapter02-pre-processor-macros' of github.com:aidangars…

…ke/documentation into chapter02-pre-processor-macros # Conflicts: # wolfSSL/src/chapter02.md
wolfSSL · Jun 17, 2024 · adf3c87 · adf3c87
2 parents 6117df1 + 418f35a
commit adf3c87
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/wolfSSL/src/chapter02.md b/wolfSSL/src/chapter02.md
@@ -1489,7 +1489,11 @@ Uses popen for creating socket with host and post for wolfio.c socket open code
 
 #### CloseSocket
 
+<<<<<<< HEAD
 A way to override the function used for closing a socket. Used with CRL, OCSP and BIO.
+=======
+A way to override the function used for closing socket a socket. Used with CRL, OCSP and BIO.
+>>>>>>> 418f35ade78feb44af5cd196525979207e953bcb
 
 #### CONFIG_POSIX_API