diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1848c43318..cd4b3e9bf4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,9 +1,12 @@
-<<<<<<< ChangeLog
+Mon Mar 29 13:55:29 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* xcoffread.c: Nuke NAMES_HAVE_DOT define (not used).
+
 Fri Mar 26 11:29:30 1993  Jim Kingdon  (kingdon@cygnus.com)
 
 	* breakpoint.{c,h}: Add exp_string to struct breakpoint and use
 	it in breakpoint_re_set.
-=======
+
 Sun Mar 28 11:24:37 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* breakpoint.c (breakpoint_re_set_one): Fix storage leak.
@@ -25,7 +28,6 @@ Fri Mar 26 15:25:05 1993  John Gilmore  (gnu@cygnus.com)
 	* Makefile.in (TARFILES):  Avoid trailing backslash.
 
 Fri Mar 26 11:29:30 1993  Jim Kingdon  (kingdon@cygnus.com)
->>>>>>> 1.1087
 
 	* breakpoint.c (watch_command, enable_breakpoint): Fetch lazy values.
 
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 54948900fa..5336ec855a 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -29,9 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "defs.h"
 #include "bfd.h"
 
-/* AIX XCOFF names have a preceeding dot `.' */
-#define NAMES_HAVE_DOT 1
-
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>