Index: openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml	4 Jun 2006 00:45:56 -0000	1.2
+++ openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml	5 Nov 2006 12:38:02 -0000	1.3
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<<<<<<< search.de_DE.ISO-8859-1.xml
+<message_catalog package_key="search" package_version="5.2.2" locale="de_DE" charset="ISO-8859-1">
+=======
 <message_catalog package_key="search" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1">
+>>>>>>> 1.1.2.2
 
   <msg key="Advanced_Search">Erweiterte Suche</msg>
   <msg key="and_not_needed">Der '&lt;b&gt;AND&lt;/&gt;' operator is unn�tig -- es sind alle Suchbegriffe standardm�ssig enthalten</msg>