From 166247fb9d59625ca1849d020caef3f01601b437 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 28 Mar 2007 18:15:49 +0000
Subject: [PATCH] 2007-03-28	Joel Sherrill <joel@OARcorp.com>

	* include/amba.h: Remove CVS conflict marker.
---
 c/src/lib/libbsp/sparc/leon3/ChangeLog      | 4 ++++
 c/src/lib/libbsp/sparc/leon3/include/amba.h | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index a9925dd889..9bd3ed06b3 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-28	Joel Sherrill <joel@OARcorp.com>
+
+	* include/amba.h: Remove CVS conflict marker.
+
 2007-03-11	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/bspstart.c: Remove assignments of
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/c/src/lib/libbsp/sparc/leon3/include/amba.h
index 2701d44daa..fb98df9582 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/amba.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/amba.h
@@ -10,11 +10,7 @@
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
  *
-<<<<<<< amba.h
  *  $Id$
-=======
- *  $Id$
->>>>>>> 1.3
  */
 
 #define LEON3_IO_AREA 0xfff00000