From 53dd838de6cd455f00f43ef7f733d4e9b420b8d8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sun, 21 Sep 2008 12:09:12 -0700
Subject: swrast: remove merge droppings

---
 src/mesa/sources | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/mesa/sources')

diff --git a/src/mesa/sources b/src/mesa/sources
index 9278ca88e9..9a34d1a989 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -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
-- 
cgit v1.2.3