From: Charlie Fish <fishcharlie@me.com>
Date: Wed, 7 Jul 2021 21:11:53 +0000 (-0600)
Subject: Merge branch 'master' into lint
X-Git-Tag: aggregated-20250518~474^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F370%2Fhead;p=thirdparty%2Fblocklistproject%2Flists.git

Merge branch 'master' into lint

# Conflicts:
#	malware.txt
#	scam.txt
---

2c2e104083b97e96ce36365173fafdb4b1646a86
diff --cc malware.txt
index d79ba3b,45a04ac..3f145a0
--- a/malware.txt
+++ b/malware.txt
@@@ -456346,4 -456346,4 +456346,4 @@@
  0.0.0.0 zzzyzs.net
  0.0.0.0 avsvmcloud.com
  0.0.0.0 my-sweet-sexfinder.com
- 0.0.0.0 whynotwin11.com
 -#0.0.0.0 whynotwin11.com Issue 375
++#0.0.0.0 whynotwin11.com Issue 375
diff --cc scam.txt
index 7f52b9a,590d8d9..87a48c0
--- a/scam.txt
+++ b/scam.txt
@@@ -1193,4 -1193,4 +1193,4 @@@
  0.0.0.0 citasyencuentros.com
  0.0.0.0 ammjaflk.ru
  0.0.0.0 hovrecording.com
- 0.0.0.0 whynotwin11.com
 -#0.0.0.0 whynotwin11.com Issue 375
++#0.0.0.0 whynotwin11.com Issue 375