diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-18 05:14:25 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-18 05:14:25 +0000 |
| commit | 1940c42043b0796c34747026593a0f5e7fcb10d9 (patch) | |
| tree | 724bfff0ea160f3ef5b1e5bc16cf68ebbee0e18a /cpukit | |
| parent | 2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-1940c42043b0796c34747026593a0f5e7fcb10d9.tar.bz2 | |
Remove conflict indicator.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 24f334d8de..67016c2081 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -24,7 +24,6 @@ score/src/schedulersimplesmpschedule.c, score/src/schedulersimplesmpunblock.c: New files. ->>>>>>> 1.2833 2011-05-16 Ralf Corsépius <ralf.corsepius@rtems.org> * libnetworking/Makefile.am: Reformat. |