Modified Files:

	ChangeLog

	* Fix cvs conflict parts.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 94e79b8e100fec3adcf160066136cc2d626d244f..bbaf1a501a2d34ed457013e49300e434b443f28c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,20 +1,7 @@
-<<<<<<< ChangeLog
 Fri Oct  1 10:06:35 1993  Kung Hsu  (kung@cirdan.cygnus.com)
 
        * symtab.c: fix a bug in testsuite (virtfunc.exp)
 
-Wed Sep 29 10:53:24 1993  Kung Hsu  (kung@cirdan.cygnus.com)
-
-       * cp-valprint.c: change vtble field name to __vtbl (pr2695)
-
-       * symtab.c: fix a bug in gdb_mangle_name, to get mangled name right
-
-<<<<<<< ChangeLog
-Wed Sep 29 09:50:11 1993  Kung Hsu  (kung@cirdan.cygnus.com)
-
-       * c-valprint.c: to fix virtual table print bug (pr2695)
-
-=======
 Thu Sep 30 11:30:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * m88k-nat.c (fill_gregset): Fix typo (R_SFIP -> R_FIP).