[xorg-commit-diffs] xc/programs/Xserver/mi miinitext.c, 1.1.4.4.2.1, 1.1.4.4.2.2

[Stuart Kreitman]

Committed by: stukreit

Update of /cvs/xorg/xc/programs/Xserver/mi
In directory pdx:/tmp/cvs-serv9332

Modified Files:
      Tag: DAMAGE-XFIXES
	miinitext.c 
Log Message:
typo error around XFIXES macros.
Modified Files:
 Tag: DAMAGE-XFIXES
	miinitext.c 


Index: miinitext.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.2
diff -u -d -r1.1.4.4.2.1 -r1.1.4.4.2.2
--- a/miinitext.c	30 Mar 2004 18:44:05 -0000	1.1.4.4.2.1
+++ b/miinitext.c	30 Mar 2004 19:32:53 -0000	1.1.4.4.2.2
@@ -377,15 +377,12 @@
 #ifdef RES
     ResExtensionInit();
 #endif
-<<<<<<< miinitext.c
 #ifdef XFIXES
     XFixesExtensionInit();
 #endif
 #ifdef DAMAGE
     DamageExtensionInit();
 #endif
-=======
->>>>>>> 1.1.4.4
 }
 
 void