From c7f4bbda99cdba696d30b510530af90d9434ea2d Mon Sep 17 00:00:00 2001 From: Conrad Scott Date: Fri, 16 Aug 2002 22:48:47 +0000 Subject: Fix bad merge. --- winsup/cygwin/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 462dc356f..2c0e34124 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -118,7 +118,6 @@ MALLOC_OFILES=@MALLOC_OFILES@ DLL_IMPORTS:=$(w32api_lib)/libkernel32.a # Please maintain this list in sorted order, with maximum files per 80 col line -<<<<<<< Makefile.in DLL_OFILES:=assert.o autoload.o cygheap.o cygserver_client.o \ cygserver_transport.o cygserver_transport_pipes.o \ -- cgit v1.2.3