From 143f7198794f00530bb92ea6b4bf17dff0126438 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliamson@mandriva.org>
Date: Fri, 28 Sep 2007 17:27:54 +0000
Subject: revert my changes that were in conflict with fred's

---
 ChangeLog | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a9a5b00..beb6842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2007-09-28 16:57  Adam Williamson <awilliamson at mandriva.com>
-
-	* ChangeLog: Generated by svn2cl the Fri 28 Sep 2007 09:57:33 AM
-	  PDT
-
-2007-09-28 16:57  Adam Williamson <awilliamson at mandriva.com>
-
-	* desktop/free/register.desktop.in,
-	  desktop/one/register.desktop.in,
-	  desktop/powerpack/register.desktop.in: adjust default icons:
-	  change 'register' icon to point to my.mandriva.com, remove 'buy
-	  it' icon (#34238, #34235)
-
 2007-09-28 16:49  Frederic Crozat <fcrozat at mandriva.com>
 
 	* desktop/free/register.desktop.in,
-- 
cgit v1.2.1