1 files changed, 4 insertions, 0 deletions

diff --git a/ue2/imgsynth2/Makefile b/ue2/imgsynth2/Makefile
index 22e53e5..3183b54 100644
--- a/ue2/imgsynth2/Makefile
+++ b/ue2/imgsynth2/Makefile
@@ -5,8 +5,12 @@
 CXX=            g++
 LD=             $(CXX)
 DEBUGFLAGS=     -DNDEBUG
+<<<<<<< local
 INCLUDE_PATH=   -I/usr/local/include
 CXXFLAGS=       -O -ansi -pedantic-errors -Wall $(INCLUDE_PATH) $(DEBUGFLAGS)
+=======
+CFLAGS=         -O -ansi -pedantic-errors -Wall -I/usr/local/include $(DEBUGFLAGS)
+>>>>>>> other
 LDFLAGS=
 LIBS=           -L/usr/local/lib -lboost_program_options