diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index e1f516f891..42bea8bfbc 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2005,8 +2005,13 @@ 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: |