*** empty log message ***

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d92cf0a6a015e4603d115ea97544c2c540063742..14da95c6debe9eb1c8e85aa250441219307c0ddf 100644 (file)
--- 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