[Lunar-commits] CVS: moonbase/kernel/kernel-headers-2.6 CONFLICTS, 1.1, 1.2

[Terry Chan]

Update of /var/cvs/lunar/moonbase/kernel/kernel-headers-2.6
In directory dbguin.lunar-linux.org:/tmp/cvs-serv22389

Modified Files:
	CONFLICTS 
Log Message:
Added EOL char for the stranger editor that was used last on this file.


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/kernel-headers-2.6/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	26 Feb 2004 19:50:36 -0000	1.1
+++ CONFLICTS	26 Feb 2004 20:38:58 -0000	1.2
@@ -1,2 +1,2 @@
 # conflicts with any other kernel header install
-conflicts kernel-headers 
\ No newline at end of file
+conflicts kernel-headers