debrix Imakefile,1.5,1.6

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix
In directory pdx:/home/daniel/x/debrix/debrix

Modified Files:
	Imakefile 
Log Message:
Resolve another conflict created by the import; I shouldn't do this sort of
stuff so late.


Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix/Imakefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Imakefile	10 Jun 2004 19:39:20 -0000	1.5
+++ Imakefile	10 Jun 2004 19:47:27 -0000	1.6
@@ -187,11 +187,7 @@
 #endif
         EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
                   $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
-<<<<<<< Imakefile
                   $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR)
-=======
-                  $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) $(XPCONFIGDIR)
->>>>>>> 1.4
 #if BuildLBX || GzipFontCompression
            ZLIB = GzipLibrary
 #endif