From 0bcdc6472ef63a9bd55a8e7bde3d103708e48078 Mon Sep 17 00:00:00 2001
From: weiyu <weiyuluo1232@gmail.com>
Date: Mon, 1 Jul 2019 11:59:13 -0700
Subject: [PATCH] resolve git conflict

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

diff --git a/Makefile b/Makefile
index 214873ac..75639215 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ README.html: README.md
 malloc.o: malloc.c
 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=1 $(CPPFLAGS) -Wno-unused-variable
 
-#futex.o: futex.cc
-#	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
+futex.o: futex.cc
+	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
 
 %.o : %.cc
 	$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
-- 
2.34.1