resolve merge conflict

2017-04-04 17:52:13 -04:00 · 2017-04-04 17:52:13 -04:00 · 53fd5518dc
parent feb505e932
commit 53fd5518dc
1 changed files with 1 additions and 0 deletions
--- a/buffer.h
+++ b/buffer.h
@ -27,6 +27,7 @@
 #else
    #include <malloc.h>
 #endif
+
 #include <limits.h> /* implementation-defined data type ranges and limits */

 /* constant definitions */