From ac6b840dc5131da2952576ca0078fd627f177f3c Mon Sep 17 00:00:00 2001
From: jrblixt <jrblixt@gmail.com>
Date: Thu, 13 Apr 2017 16:51:08 -0600
Subject: [PATCH] Merge Conflict with wolfSSL master.

---
 wolfcrypt/src/sha256.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c
index 4b5fbd877..40fc57e53 100755
--- a/wolfcrypt/src/sha256.c
+++ b/wolfcrypt/src/sha256.c
@@ -38,7 +38,7 @@
 
     int wc_InitSha256(Sha256* sha)
     {
-   		if (sha == NULL) {
+   	    if (sha == NULL) {
         	return BAD_FUNC_ARG;
     	}
         return InitSha256_fips(sha);