Index: openacs-4/www/packages/conflicts.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/packages/Attic/conflicts.txt,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/www/packages/conflicts.txt	1 Dec 2004 10:42:17 -0000	1.1
@@ -0,0 +1 @@

\ No newline at end of file