summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-21 12:50:39 -0800
committerJeremy Allison <jra@samba.org>2007-12-21 12:50:39 -0800
commitb775fe0a170f9b6043aaea2c025fd70528c7e7e8 (patch)
treee241de12184e32f54256c0b3cdfd26600e8973e8
parent03d3009986b3c82b55723e6db21e386a6bcedee8 (diff)
downloadsamba-b775fe0a170f9b6043aaea2c025fd70528c7e7e8.tar.gz
samba-b775fe0a170f9b6043aaea2c025fd70528c7e7e8.tar.bz2
samba-b775fe0a170f9b6043aaea2c025fd70528c7e7e8.zip
Actually fix the merge.
Jeremy. (This used to be commit c855de0c05e2e271e2610de67a6d7e3aba52390f)
-rw-r--r--source3/Makefile.in5
1 files changed, 0 insertions, 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: