From 53fd5518dc6c3605f5dce9cc0f51df4bfcffa712 Mon Sep 17 00:00:00 2001
From: Victor Fernandes <victorvalenca@gmail.com>
Date: Tue, 4 Apr 2017 17:52:13 -0400
Subject: [PATCH] resolve merge conflict

---
 buffer.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buffer.h b/buffer.h
index 676c035..cdd45f9 100755
--- 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 */