From 879f1e469db57cd480bb33ff91340ad1a5be2bff Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 16 Oct 2006 16:04:48 +0000
Subject: Fix broken file

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

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6135df2e4d..17121940e7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -82,7 +82,6 @@
 	libmisc/stackchk/stackchk.h: Move stack to first class citizen
 	status. Include it in User Manual and rename to start with rtems_.
 
->>>>>>> 1.705
 2006-09-11	Joel Sherrill <joel@OARcorp.com>
 
 	* libmisc/mw-fb/mw_fb.c, libmisc/mw-fb/mw_fb.h, libmisc/mw-fb/mw_uid.c,
-- 
cgit v1.2.3