From 1d27a496efa6ee74a04a414e333de3129daac933 Mon Sep 17 00:00:00 2001
From: jfreegman <jfreegman@gmail.com>
Date: Fri, 6 Jul 2018 15:43:32 -0400
Subject: [PATCH] fix merge mistake

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 83d44be..fc4970d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@ CFG_DIR = $(BASE_DIR)/cfg
 
 -include $(CFG_DIR)/global_vars.mk
 
-LIBS = toxcore ncursesw libconfig libqrencode
+LIBS = toxcore ncursesw libconfig 
 
-CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all
+CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all -fsanitize=address 
 CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
 CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
 CFLAGS += $(USER_CFLAGS)