From: minima <minima>
Date: Thu, 4 Oct 2001 14:59:59 +0000 (+0000)
Subject: sort conflicts
X-Git-Tag: R_1_49~59
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=0ab700a4725f5fedc0ad119f8ffd1d66cd02e26f;p=spider.git

sort conflicts
---

diff --git a/data/badw_regex.issue b/data/badw_regex.issue
index 5635fe43..489da617 100644
--- a/data/badw_regex.issue
+++ b/data/badw_regex.issue
@@ -4,18 +4,19 @@
 # eg 'fuck' 'ffuck' 'fffuuucckk' 'f    u...c  kkkk' 'youf u c.. ker'
 fuck
 cunt
+cock c0ck
 wank
-shit
-piss
-bolock
-toser
-tospot
+shit sh1t
+piss p1ss
+bolock b0lock b0lock
+toser t0ser
+tospot t0spot t0sp0t
 arse
-plonker
-ashole
-arsehole
+plonker pl0nker
+ashole ash0le
+arsehole arseh0le
 buger
-jihad
+jihad j1had
 alah
 raghead
-muslim
+muslim muls1m