Actually fix the merge.

Jeremy.

diff --git a/source/Makefile.in b/source/Makefile.in
index 42bea8bfbc8b4166ca7669db91c12fea2124996d..e1f516f891050fdee4346e6f788ffe28cbe54868 100644 (file)
--- a/source/Makefile.in
+++ b/source/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: