From 5771e1ad2073dbcbc2d910d35d0f39e3599077e4 Mon Sep 17 00:00:00 2001
From: Rone Charles <rone_charles@fastmail.com>
Date: Fri, 21 Apr 2017 15:38:24 -0400
Subject: [PATCH] Fix merge conflict

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 59a8b2b8..f85df392 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,7 @@ prefix = /usr/local
 bindir = $(prefix)/bin
 
 INC =
-<<<<<<< HEAD
-LIBS = -lreadline -ltermcap -lz
-=======
 LIBS = -lz
->>>>>>> v2.3.1.1
 GCC_PREFIX = $(shell dirname `which gcc`)
 GCC_SUFFIX =
 CC ?= $(GCC_PREFIX)/gcc$(GCC_SUFFIX)