From 17bccd41201d7d6edc758a80f0c503a41c46dd29 Mon Sep 17 00:00:00 2001
From: Brian Ford <Brian.Ford@FlightSafety.com>
Date: Wed, 30 Jan 2008 18:49:59 +0000
Subject: Remove conflict marker as obvious.

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

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 551d7a530..8501c00b5 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -42,7 +42,6 @@
 	(CHEWOUT_FILES): Build documentation for memmem.
 	* libc/string/strings.tex: Include new docs.
 
->>>>>>> 1.1116
 2008-01-08  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/machine/m68k/memcpy.S: Remove % from register references
-- 
cgit v1.2.3