From af11f16befceedc5a7df14c7decfdde7318bf7f4 Mon Sep 17 00:00:00 2001
From: jfreegman <jfreegman@gmail.com>
Date: Sat, 7 Jul 2018 10:29:12 -0400
Subject: [PATCH] fix merge mistake take 2

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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