2007-03-28 Joel Sherrill <joel@OARcorp.com>

* include/amba.h: Remove CVS conflict marker.
2007-03-28 18:15:49 +00:00
parent 81b291532c
commit 166247fb9d
2 changed files with 4 additions and 4 deletions
--- 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
--- 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