[monkey-bubble: 512/753] Next time, you will be killed, dude !

[Sven Herzberg <herzi src gnome org>]

commit 3e5ad38dae541feebf17561cca099c6a322b33a7
Author: Martin Baulig <martin src gnome org>
Date:   Mon Jul 9 09:21:40 2001 +0000

    Next time, you will be killed, dude !

 po/ChangeLog |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/po/ChangeLog b/po/ChangeLog
index 4d202d0..80c685b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,33 +1,11 @@
-2001-07-08  gettextize  <bug-gnu-utils gnu org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.37.
-
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-2001-06-22  gettextize  <bug-gnu-utils gnu org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.37.
-
-2001-06-22  gettextize  <bug-gnu-utils gnu org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.37.
-
-2001-06-22  gettextize  <bug-gnu-utils gnu org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.37.
-
-=======
-=======
 2001-07-07  Christopher R. Gabriel  <cgabriel cgabriel org>
 
 	* it.po: Added italian translation.
 
->>>>>>> 1.11
 2001-06-26  Fatih Demir <kabalak gtranslator org>
 
 	* ta.po: Added Tamil translation by Dinesh.
 
->>>>>>> 1.10
 2001-06-19  Héctor García Álvarez  <hector scouts-es org>
 
         * es.po: Updated Spanish translation.