Index: openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	10 Jun 2005 19:21:14 -0000	1.4
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	16 Jun 2005 05:33:57 -0000	1.5
@@ -22,9 +22,13 @@
   <msg key="Comment">Kommentar:</msg>
   <msg key="Comments">Kommentar</msg>
   <msg key="Complete">abgeschlossen:</msg>
+<<<<<<< project-manager.de_DE.ISO-8859-1.xml
   <msg key="create_project">Projekt erstellen</msg>
+=======
+  <msg key="create_project">Projekt erstellen</msg>
   <msg key="Created">Erstellt</msg>
   <msg key="CSV">CSV</msg>
+>>>>>>> 1.3
   <msg key="Customer">Kunde</msg>
   <msg key="Customer_Name">Kundenname</msg>
   <msg key="Customers">Kunden</msg>