From e5aa0d1b66247e41722ea61a563af493ff988094 Mon Sep 17 00:00:00 2001
From: Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
Date: Fri, 18 Jul 2008 07:38:55 +0000
Subject: [PATCH] resolved conflict

---
 c/src/lib/libbsp/powerpc/gen83xx/ChangeLog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index b3ddac2d9f..d030c18f2a 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< ChangeLog
-2008-05-15	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+2008-07-18	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* network/network.c:
 	mpc8249eamds uses gmii mode
 
-=======
 2008-07-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove RTEMS_AMPOLISH3.
 
->>>>>>> 1.31
 2008-07-14	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* irq/irq_init.c, irq/irq.h, startup/linkcmds: