From 47497f5aaace698c8b59e6b1abad0f97253972d2 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Wed, 27 Jun 2018 10:40:03 -0700
Subject: [PATCH] Removed stray merge failure marker debris.

---
 doc/dox_comments/header_files/coding.h |  3 ---
 doc/dox_comments/header_files/memory.h | 18 ------------------
 doc/dox_comments/header_files/random.h |  6 ------
 3 files changed, 27 deletions(-)

diff --git a/doc/dox_comments/header_files/coding.h b/doc/dox_comments/header_files/coding.h
index 698b54c94..455ad0c19 100644
--- a/doc/dox_comments/header_files/coding.h
+++ b/doc/dox_comments/header_files/coding.h
@@ -198,10 +198,7 @@ int Base64_Encode_NoNl(const byte* in, word32 inLen, byte* out,
 */
 WOLFSSL_API
 int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Base_Encoding
     
diff --git a/doc/dox_comments/header_files/memory.h b/doc/dox_comments/header_files/memory.h
index 7f608d3cc..5833cb2d5 100644
--- a/doc/dox_comments/header_files/memory.h
+++ b/doc/dox_comments/header_files/memory.h
@@ -25,10 +25,7 @@
     \sa XREALLOC
 */
 WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type, const char* func, unsigned int line);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
@@ -59,10 +56,7 @@ WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type, const char*
     \sa XREALLOC
 */
 WOLFSSL_API void  wolfSSL_Free(void *ptr, void* heap, int type, const char* func, unsigned int line);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
@@ -92,10 +86,7 @@ WOLFSSL_API void  wolfSSL_Free(void *ptr, void* heap, int type, const char* func
     \sa XREALLOC
 */
 WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type, const char* func, unsigned int line);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
@@ -126,10 +117,7 @@ WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type,
     \sa wolfSSL_SetAllocators
 */
 WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
@@ -164,10 +152,7 @@ WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type);
     \sa wolfSSL_SetAllocators
 */
 WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
@@ -192,10 +177,7 @@ WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type);
     \sa wolfSSL_SetAllocators
 */
 WOLFSSL_API void  wolfSSL_Free(void *ptr, const char* func, unsigned int line);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Memory
     
diff --git a/doc/dox_comments/header_files/random.h b/doc/dox_comments/header_files/random.h
index c7e650ccc..fa60855cb 100644
--- a/doc/dox_comments/header_files/random.h
+++ b/doc/dox_comments/header_files/random.h
@@ -25,10 +25,7 @@
     \sa wc_FreeNetRandom
 */
 WOLFSSL_API int  wc_InitNetRandom(const char*, wnr_hmac_key, int);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Random
     
@@ -51,10 +48,7 @@ WOLFSSL_API int  wc_InitNetRandom(const char*, wnr_hmac_key, int);
     \sa wc_InitNetRandom
 */
 WOLFSSL_API int  wc_FreeNetRandom(void);
-<<<<<<< HEAD
 
-=======
->>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
 /*!
     \ingroup Random