From 36eeadb29dd076b6d208c70a351b4660fd171318 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@codesourcery.com>
Date: Tue, 19 Jan 1999 16:57:09 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d92cf0a6a0..14da95c6de 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -140,7 +140,6 @@ Mon Jan 18 08:47:02 1999  Andrew Cagney  <cagney@b1.cygnus.com>
 	* remote.c (remote_query): new function - creates proper interface
 	to the remote protocol "q" command.	
 
->>>>>>> 1.4744
 Fri Jan 15 17:11:48 EST 1999  Zdenek Radouch   (radouch@cygnus.com)
 
 	* config/fr30/tm-fr30.h:  Changed ABI to match GCC change