swrast: remove merge droppings

diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h
index a4fc53e2c010e08f036f0653f2056976e6eeff2e..9e39c601efb25e6f9c1707b9c703a5f7023a1e1b 100644 (file)
--- 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 );