From f0d56210f6ec9aa3b5b0db7de189d204c92406ab Mon Sep 17 00:00:00 2001
From: Henry Ault <henry@tlon.io>
Date: Fri, 1 May 2015 12:05:16 -0700
Subject: [PATCH] small update

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

diff --git a/Makefile b/Makefile
index b29af42c7d..cf1a8ea5a3 100644
--- a/Makefile
+++ b/Makefile
@@ -64,15 +64,7 @@ INCLUDE=i
 MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
-<<<<<<< Updated upstream
 CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
-||||||| merged common ancestors
-# 	-DGHETTO
-CFLAGS= $(COSFLAGS) -g -msse3 -ffast-math \
-=======
-# 	-DGHETTO
-CFLAGS= $(COSFLAGS)  -msse3 -ffast-math \
->>>>>>> Stashed changes
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \