summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-11-21 12:21:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:46:35 -0500
commit309645e00293e5964721db10e6c3eb3bb7d250f2 (patch)
tree0b12c8f7d048c493f834d4371ab3d4b0ad53b75f
parenta1c8fe7ce2deefa4bd8d3efc0158b8de2f946504 (diff)
downloadsamba-309645e00293e5964721db10e6c3eb3bb7d250f2.tar.gz
samba-309645e00293e5964721db10e6c3eb3bb7d250f2.tar.xz
samba-309645e00293e5964721db10e6c3eb3bb7d250f2.zip
r11829: remove unused #if 1
metze (This used to be commit 80f2e50387eedecfe661f0e48e7287017a34a508)
-rw-r--r--source4/torture/nbt/winsreplication.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index b7a154491eb..66e1416afe6 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -1151,7 +1151,6 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
BOOL sgroup_cleanup;
} r1, r2, result;
} records[] = {
-#if 1
/*
* NOTE: the first record and the last applied one
* needs to be from the same owner,
@@ -3863,7 +3862,6 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
.apply_expected = True,
}
},
-#endif
/*
* special group vs special group section,
*/