fix merge differences from this week

This commit is contained in:
toddouska
2013-05-22 15:50:13 -07:00
parent acaa2c02bf
commit 8df0e43384
3 changed files with 1 additions and 4 deletions

View File

@@ -25,8 +25,6 @@
#include <cyassl/ctaocrypt/settings.h>
/* submitted by eof */
#ifdef USE_CYASSL_MEMORY
#include <cyassl/ctaocrypt/memory.h>