SKIP TESTS - DONT PUSH

diff --git a/selftest/skip b/selftest/skip
index f59f824147cc795e69c225e7f5a68b509106a050..5aa57332d08478b1884579c29905e4161479c510 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -145,3 +145,10 @@ bench # don't run benchmarks in our selftest
 ^samba4.blackbox.ktpass # this test isn't portable ...
 ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
 ^samba.tests.dcerpc.unix  # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
+<<<<<<< HEAD
+=======
+GETADDRINFO # socket wrapper doesn't support threads
+^samba.tests.docs
+^samba4.blackbox.dbcheck
+^samba4.blackbox.upgradeprovision
+>>>>>>> a507208... SKIP TESTS - DONT PUSH