fix test_wolfSSL_CTX_load_verify_locations() build error

2018-09-11 15:55:55 +09:00
parent cf5377ec5b
commit ca9f62713d
2 changed files with 2 additions and 4 deletions
--- a/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c
+++ b/IDE/Renesas/cs+/Projects/common/wolfssl_dummy.c
@@ -51,13 +51,9 @@ int strncasecmp(const char *s1, const char * s2, unsigned int sz)
 	}
 	if(toupper(*s1) > toupper(*s2)){
 	    return 1;
-<<<<<<< HEAD
-    return 0;
-=======
 	}
    }
    return 0;	
->>>>>>> Refactor cs+ project
 }
    
 void abort(void)