Fix merge conflict

BenLangmead · 5771e1ad2073dbcbc2d910d35d0f39e3599077e4 · ch4rr0 committed Apr 21, 2017 · Apr 21, 2017 · 5771e1a
1 parent d1fce1f
commit 5771e1ad2073dbcbc2d910d35d0f39e3599077e4
Unified Split

Showing with 0 additions and 4 deletions.

+0 −4 Makefile
diff --git 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)