From f9958a1ac625d8608e4a8a0c0d4c9f9d108cc401 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Sun, 21 Sep 2008 11:46:36 -0700 Subject: [PATCH] swrast: remove merge droppings --- src/mesa/swrast/s_points.h | 4 ---- 1 file changed, 4 deletions(-) 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 ); -- 2.30.2