From 77d39ffb35fbf9a5091e7745397bd8e9bebddc59 Mon Sep 17 00:00:00 2001
From: Bethany Sonefeld <166d4e79dc4661@cloudflare.com>
Date: Thu, 25 Aug 2022 07:10:30 +0000
Subject: [PATCH] Merge error

---
 anti-tor_users/domains/JSON/antitor_u.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anti-tor_users/domains/JSON/antitor_u.json b/anti-tor_users/domains/JSON/antitor_u.json
index e11da00d18..8ee99ace74 100644
--- a/anti-tor_users/domains/JSON/antitor_u.json
+++ b/anti-tor_users/domains/JSON/antitor_u.json
@@ -1 +1 @@
-{"forum.umbandaeucurto.com":1,"special.usps.com":1,"store.usps.com":1,"tools.usps.com":1,"ulukayin.org":1,"unchainedpodcast.com":1,"uncomics.org":1,"unvarnishedfacts.com":1,"urbanbike.com":1,"uub.jp":1,"www.fns.usda.gov":1,"www.fs.usda.gov":1,"www.fsis.usda.gov":1,"www.ubereats.com":1,"www.un.org":1,"www.upmedia.mg":1}
\ No newline at end of file
+{"adb.zuv.uni-heidelberg.de":1,"forum.umbandaeucurto.com":1,"special.usps.com":1,"store.usps.com":1,"tools.usps.com":1,"ulukayin.org":1,"unchainedpodcast.com":1,"uncomics.org":1,"unvarnishedfacts.com":1,"urbanbike.com":1,"uub.jp":1,"www.fns.usda.gov":1,"www.fs.usda.gov":1,"www.fsis.usda.gov":1,"www.ubereats.com":1,"www.un.org":1,"www.upmedia.mg":1}
\ No newline at end of file