From: Paul N. Hilfinger <hilfinger@adacore.com>
Date: Tue, 9 Sep 2003 08:17:44 +0000 (+0000)
Subject: Correct small glitch introduced in ChangeLog by last commit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3091e5170699fb84c0987854dfd32d5988c20a3b;p=binutils-gdb.git

Correct small glitch introduced in ChangeLog by last commit.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9723adaf369..d79901474e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -421,7 +421,6 @@
 	frame_unwind_register_unsigned instead of
 	frame_unwind_unsigned_register.
 
->>>>>>> current-public.22/gdb/ChangeLog Mon, 08 Sep 2003 21:54:22 -0700 hilfingr (GdbPub/g/3_ChangeLog 1.15.1.2.1.1 644)
 2003-08-30  Mark Kettenis  <kettenis@gnu.org>
 
 	* configure.in: Search for gethostbyname in libnsl.