X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_points.h;h=9e39c601efb25e6f9c1707b9c703a5f7023a1e1b;hb=5d10890795d9bddc8cafc4afb19cacf164d6e667;hp=a4fc53e2c010e08f036f0653f2056976e6eeff2e;hpb=dd90d304f2751cbd3ca9a961c8e54d37aaa47d91;p=mesa.git

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 );