* ser-go32.c: Define job_control variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d82c0fffc42c5b9403b0017871a1176bb6d4763..6d3af492397f16489d3221303e0c356a65633662 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,14 +1,12 @@
-<<<<<<< ChangeLog
 Thu Aug  5 08:58:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * ser-go32.c: Define job_control variable.
-=======
+
 Thu Aug  5 15:56:13 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
 
        * configure.in: z8k-coff is the same as z8k-sim
 
 Thu Aug  5 08:58:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
->>>>>>> 1.1606
 
        * 29k-share/udi/udip2soc.c: Include sys/types.h before sys/file.h.