From 5001f7a5e8c56be295c4ae9ac0ec78320eeb8f5e Mon Sep 17 00:00:00 2001
From: Marcus Sundberg <mackan@stacken.kth.se>
Date: Sat, 8 Jan 2000 22:38:53 +0000
Subject: [PATCH] Removed CVS conflict.

---
 configure.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/configure.in b/configure.in
index 1a01292..f4f11ad 100644
--- a/configure.in
+++ b/configure.in
@@ -341,13 +341,8 @@ fi
 if test "x$HAS_OGL" != xyes; then
    OGL_CFLAGS="" OGL_LIBS=""
 else
-<<<<<<< configure.in
-   if test "x$HAS_XMESA" = xyes; then
-      AC_DEFINE(XMESA,1)
-=======
    if test "x$HAS_XMESA" = xyes; then
       AC_DEFINE(XMESA)
->>>>>>> 1.50
    fi
 fi