Fixed conflicts

This commit is contained in:
ManeraKai 2022-07-13 12:17:17 +03:00
commit 21000150ca
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
2 changed files with 19 additions and 34 deletions

View File

@ -16,6 +16,8 @@
"https://nitter.winscloud.net",
"https://twtr.bch.bar",
"https://twitter.dr460nf1r3.org",
"https://nitter.wef.lol",
"https://nitter.catalyst.sx",
"https://bib.actionsack.com",
"https://libreddit.domain.glass",
"https://r.nf",
@ -45,6 +47,7 @@
"https://search.albony.xyz",
"https://search.garudalinux.org",
"https://search.dr460nf1r3.org",
"https://search.wef.lol",
"https://i.actionsack.com"
],
"authenticate": [

View File

@ -14,9 +14,8 @@
"https://invidious.sethforprivacy.com",
"https://inv.bp.projectsegfau.lt",
"https://invidious.projectsegfau.lt",
"https://invidious.lunar.icu",
"https://invidious.nerdvpn.de",
"https://inv.vern.cc",
"https://invidious.nerdvpn.de",
"https://invidious.slipfox.xyz",
"https://youtube.076.ne.jp",
"https://invidious.esmailelbob.xyz",
@ -141,7 +140,10 @@
"https://nitter.priv.pw",
"https://t.com.sb",
"https://nt.vern.cc",
"https://nitter.wef.lol"
"https://nitter.wef.lol",
"https://nitter.tokhmi.xyz",
"https://nitter.catalyst.sx",
"https://unofficialbird.com"
],
"tor": [
"http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@ -304,7 +306,6 @@
"wikiless": {
"normal": [
"https://wikiless.org",
"https://wikiless.alefvanoon.xyz",
"https://wikiless.sethforprivacy.com",
"https://wiki.604kph.xyz",
"https://wikiless.lunar.icu",
@ -342,7 +343,8 @@
"https://quora.vern.cc",
"https://quetre.pussthecat.org",
"https://wuetre.herokuapp.com",
"https://quetreus.herokuapp.com"
"https://quetreus.herokuapp.com",
"https://quetre.tokhmi.xyz"
],
"tor": []
},
@ -350,7 +352,8 @@
"normal": [
"https://libremdb.herokuapp.com",
"https://libremdb.pussthecat.org",
"https://libremdbeu.herokuapp.com"
"https://libremdbeu.herokuapp.com",
"https://lmdb.tokhmi.xyz"
],
"tor": []
},
@ -399,6 +402,7 @@
"searx": {
"tor": [
"http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
"http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
"http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
"http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
"http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@ -415,9 +419,6 @@
"https://dynabyte.ca",
"https://jsearch.pw",
"https://nibblehole.com",
"https://search.antonkling.se",
"https://search.chemicals-in-the-water.eu",
"https://procurx.pt",
"https://search.ethibox.fr",
"https://search.jpope.org",
"https://search.snopyta.org",
@ -442,11 +443,11 @@
"https://searx.ru",
"https://searx.run",
"https://searx.semipvt.com",
"https://searx.sethforprivacy.com",
"https://searx.sp-codes.de",
"https://searx.stuehieyr.com",
"https://searx.tuxcloud.net",
"https://searx.tyil.nl",
"https://searx.vanwa.tech",
"https://searx.webheberg.info",
"https://searx.xyz",
"https://searx.zapashcanon.fr",
@ -462,7 +463,6 @@
},
"searxng": {
"tor": [
"http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
"http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
"http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
"http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
@ -488,6 +488,7 @@
"https://search.bingowaves.xyz",
"https://search.bus-hit.me",
"https://search.disroot.org",
"https://search.kiwitalk.de",
"https://search.mdosch.de",
"https://search.neet.works",
"https://search.ononoki.org",
@ -505,6 +506,7 @@
"https://searx.ebnar.xyz",
"https://searx.ericaftereric.top",
"https://searx.esmailelbob.xyz",
"https://searx.fi",
"https://searx.fmac.xyz",
"https://searx.gnous.eu",
"https://searx.kujonello.cf",
@ -515,6 +517,7 @@
"https://searx.orion-hub.fr",
"https://searx.priv.pw",
"https://searx.prvcy.eu",
"https://searx.sethforprivacy.com",
"https://searx.sev.monster",
"https://searx.slipfox.xyz/searx",
"http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@ -546,7 +549,8 @@
"https://whoogle.dcs0.hu",
"https://whoogle.esmailelbob.xyz",
"https://whoogle.lunar.icu",
"https://whoogle.privacydev.net"
"https://whoogle.privacydev.net",
"https://search.wef.lol"
],
"tor": [],
"i2p": []
@ -572,14 +576,12 @@
"peertube": [
"https://video.slipfox.xyz",
"https://pt.vern.cc",
"https://periscope.numenaute.org",
"https://3.600900.su",
"https://vnop.org",
"https://videos.cassidypunchmachine.com",
"https://video.mullet.social",
"https://tv1.gomntu.space",
"https://dalek.zone",
"https://syop.xyz",
"https://seka.pona.la",
"https://syop.tv",
"https://watch.thelema.social",
@ -594,7 +596,6 @@
"https://vid.mkp.ca",
"https://jupiter.tube",
"https://tuvideo.encanarias.info",
"https://peertube.louis.software",
"https://videos.squat.net",
"https://peertube.chaunchy.com",
"https://tube.vrpnet.org",
@ -607,17 +608,13 @@
"https://video.olos311.org",
"https://peertube.atilla.org",
"https://video.lapineige.fr",
"https://videos.scanlines.xyz",
"https://zapping.no-ip.info",
"https://tube.azkware.net",
"https://video.lunasqu.ee",
"https://bundang.tube.jeena.net",
"https://v.mkp.ca",
"https://peertube.eus",
"https://infothema.net",
"https://tube.nilsu.org",
"https://peertube.nrsk.no",
"https://peertube.today",
"https://podlibre.video",
"https://videos.tankernn.eu",
"https://watch.autonomous-zone.earth",
@ -698,7 +695,6 @@
"https://tube.pawelko.net",
"https://video.livecchi.cloud",
"https://anarchy.video",
"https://movies.toine.be",
"https://peertube.gsugambit.com",
"https://media.zat.im",
"https://videos.sadx.moe",
@ -727,7 +723,6 @@
"https://vid.twhtv.club",
"https://video.retroedge.tech",
"https://truvitv.com",
"https://tube.itsg.host",
"https://pt.ilyamikcoder.com",
"https://peertube.sensin.eu",
"https://watch.riverside.rocks",
@ -737,7 +732,6 @@
"https://video.asgardius.company",
"https://video.publicspaces.net",
"https://video.eientei.org",
"https://vhs.2xx04.xyz",
"https://tv.suwerenni.org",
"https://tube.revertron.com",
"https://tube.erzbistum-hamburg.de",
@ -768,7 +762,6 @@
"https://video.greenmycity.eu",
"https://peertubemirror.satoshishop.de",
"https://przej.me",
"https://tube.motuhake.xyz",
"https://pt.mezzo.moe",
"https://tube.dsocialize.net",
"https://video.pourpenser.pro",
@ -905,7 +898,6 @@
"https://live.solari.com",
"https://live.codinglab.ch",
"https://dud-video.inf.tu-dresden.de",
"https://peertube.negativezero.link",
"https://media-test.interior.edu.uy",
"https://media.interior.edu.uy",
"https://bitcast.online",
@ -918,7 +910,6 @@
"https://tube.cnr.it",
"https://peertube.dtmf.ca",
"https://tube.ponsonaille.fr",
"https://peertube.ares.bioxis-server.fr",
"https://tube.int5.net",
"https://peertube.jackbot.fr",
"https://stream.nuemedia.se",
@ -1041,7 +1032,6 @@
"https://peertube.scyldings.com",
"https://gade.o-k-i.net",
"https://peertube.mobilsicher.de",
"https://tube.emy.plus",
"https://video.jigmedatse.com",
"https://video.amiga-ng.org",
"https://peertube.espace.si",
@ -1091,7 +1081,6 @@
"https://auf1.eu",
"https://tube.toontoet.nl",
"https://video.gyt.is",
"https://peertube.0x5e.eu",
"https://peertube.jensdiemer.de",
"https://tube.futuretic.fr",
"https://libra.syntazia.org",
@ -1180,8 +1169,6 @@
"https://video.triplea.fr",
"https://video.catgirl.biz",
"https://vulgarisation-informatique.fr",
"https://videos.thisishowidontdisappear.com",
"https://video.islameye.com",
"https://tube.kotur.org",
"https://peertube.euskarabildua.eus",
"https://video.veloma.org",
@ -1213,7 +1200,6 @@
"https://tube.grap.coop",
"https://webtv.vandoeuvre.net",
"https://peertube.european-pirates.eu",
"https://video.potate.space",
"https://video.fhtagn.org",
"https://kirche.peertube-host.de",
"https://v.lor.sh",
@ -1290,8 +1276,6 @@
"https://videos.weblib.re",
"https://tube.oisux.org",
"https://peertube.louisematic.site",
"https://tv2.cocu.cc",
"https://tv1.cocu.cc",
"https://clap.nerv-project.eu",
"https://tube.lacaveatonton.ovh",
"https://peertube.tspu.edu.ru",
@ -1436,7 +1420,6 @@
"https://vid.garwood.io",
"https://kolektiva.media",
"https://peertube.ichigo.everydayimshuflin.com",
"https://petitlutinartube.fr",
"https://video.lundi.am",
"https://tube.florimond.eu",
"https://peertube.taxinachtegel.de",
@ -1556,7 +1539,6 @@
"https://diode.zone",
"https://peertube.nomagic.uk",
"https://video.rastapuls.com",
"https://video.mantlepro.com",
"https://peertube.musicstudio.pro",
"https://peertube.we-keys.fr",
"https://artitube.artifaille.fr",