swrast: remove merge droppings

2008-09-21 12:09:12 -07:00
parent 00929157de
commit 53dd838de6
1 changed files with 0 additions and 5 deletions
@@ -299,9 +299,4 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)

 INCLUDE_DIRS = \
 	-I$(TOP)/include \
-<<<<<<< HEAD:src/mesa/sources
 	-I$(TOP)/src/mesa
-=======
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main
->>>>>>> master:src/mesa/sources