diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-04 16:56:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-04 16:56:23 +0000 |
| commit | 7869594e9725979994ad7b76ea4f3b2a90156b32 (patch) | |
| tree | 40330b088468dd7cee1539c433e1b70b71b6ab0e /c | |
| parent | 8d45df8368eae75ae4991c7a7ef48c49e27adccf (diff) | |
2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
* shared/start/start.S: Remove conflict markers in comment.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/start/start.S | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index e468fe692f..578ac9260e 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * shared/start/start.S: Remove conflict markers in comment. + 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index fadfd13ed1..8546aa0147 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -7,12 +7,7 @@ * found in found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. * -<<<<<<< start.S * $Id$ -======= - * $Id$ ->>>>>>> 1.25 - * */ #include <rtems/asm.h> |