From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sun, 21 Sep 2008 18:46:36 +0000 (-0700)
Subject: swrast: remove merge droppings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9958a1ac625d8608e4a8a0c0d4c9f9d108cc401;p=mesa.git

swrast: remove merge droppings
---

diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h
index a4fc53e2c01..9e39c601efb 100644
--- a/src/mesa/swrast/s_points.h
+++ b/src/mesa/swrast/s_points.h
@@ -27,11 +27,7 @@
 #ifndef S_POINTS_H
 #define S_POINTS_H
 
-<<<<<<< HEAD:src/mesa/swrast/s_points.h
-#include "main/mtypes.h"
-=======
 #include "swrast.h"
->>>>>>> master:src/mesa/swrast/s_points.h
 
 extern void
 _swrast_choose_point( GLcontext *ctx );