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

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/kernel/kernel-headers-2.6
In directory espresso.foo-projects.org:/tmp/cvs-serv23613/kernel-headers-2.6

Modified Files:
	CONFLICTS 
Log Message:
We need those. sofar should've been more carefull


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/kernel-headers-2.6/CONFLICTS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CONFLICTS	26 Feb 2004 20:38:58 -0000	1.2
+++ CONFLICTS	23 Dec 2004 12:31:06 -0000	1.3
@@ -1,2 +1 @@
-# conflicts with any other kernel header install
-conflicts kernel-headers 
+conflicts kernel-headers-2.4