Merge pull request EFForg#1158 from jsha/linuxlovers-overlap

jsha · jsha · commit e32e3b6609b8 · 2015-03-05T12:26:22.000-08:00
Fix tests.
diff --git a/src/chrome/content/rules/Linuxlovers.at.xml b/src/chrome/content/rules/Linuxlovers.at.xml
@@ -23,21 +23,11 @@
 	<target host="jabber.linuxlovers.at" />
 	<target host="mb.linuxlovers.at" />
 	<target host="tools.linuxlovers.at" />
-	<target host="wiki.linuxlovers.at" />
 	<target host="www.linuxlovers.at" />
-		<!--
-			Avoid false/broken MCB:
-						-->
-		<exclusion pattern="^http://wiki\.linuxlovers\.at/+(?!lib/)" />
-
-			<test url="http://wiki.linuxlovers.at/favicon.ico" />
-			<test url="http://wiki.linuxlovers.at/w/" />
-
 
 	<!--	Secured by server:
 					-->
 	<!--securecookie host="^git\.linuxlovers\.at$" name="^_gitlab_session$" /-->
-	<!--securecookie host="^wiki\.linuxlovers\.at$" name="^DokuWiki$" /-->
 	<!--
 		Not secured by server:
 					-->
diff --git a/src/chrome/content/rules/Shaklee.xml b/src/chrome/content/rules/Shaklee.xml
@@ -17,7 +17,7 @@
 	* Some pages redirect to http
 
 -->
-<ruleset name="Shaklee (partial)">
+<ruleset name="Shaklee (partial)" default_off="Needs ruleset tests">
 
 	<target host="myshaklee.com" />
 	<target host="www.myshaklee.com" />
