From 1940c42043b0796c34747026593a0f5e7fcb10d9 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 18 May 2011 05:14:25 +0000
Subject: Remove conflict indicator.

---
 cpukit/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cpukit')

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.
-- 
cgit v1.2.3