From b775fe0a170f9b6043aaea2c025fd70528c7e7e8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 21 Dec 2007 12:50:39 -0800 Subject: Actually fix the merge. Jeremy. (This used to be commit c855de0c05e2e271e2610de67a6d7e3aba52390f) --- source3/Makefile.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 42bea8bfbc..e1f516f891 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2005,13 +2005,8 @@ clean: delheaders # afterwards. proto_exists: include/proto.h include/build_env.h \ winbindd/winbindd_proto.h web/swat_proto.h \ -<<<<<<< HEAD:source/Makefile.in libnet/libnet_proto.h \ client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c -======= - client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c \ - libnet/libnet_proto.h ->>>>>>> d6703f6d4e6a5256980188f6a840e6aaf07bc607:source/Makefile.in @touch proto_exists delheaders: -- cgit