diff options
| -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. |