From 68c2d1af348261ecb63b5a5045c0b94f9d5c886f Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 12 Jan 2016 12:49:43 -0500 Subject: [PATCH] fixed merge errors from #1166 --- assets/checksums.txt | 2 +- assets/ublock/filter-lists.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index c46afd4fd..f052f023f 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -6,7 +6,7 @@ 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt f9bb491dbba453752199e8378ee152bb assets/ublock/experimental.txt 25d2622fb288ee3048093e86d96c72e7 assets/ublock/resources.txt -66229baa2c66a144eb87a5420ad64bc5 assets/ublock/filter-lists.json +9b78fa00c600922ab22148ecc8a706a1 assets/ublock/filter-lists.json 50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt 61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt 7f0443f3dcc9abfd47cfbc95ce824ddb assets/thirdparties/mirror1.malwaredomains.com/files/README.md diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json index 7a01c4f67..7f8f4886f 100644 --- a/assets/ublock/filter-lists.json +++ b/assets/ublock/filter-lists.json @@ -353,5 +353,12 @@ "group": "regions", "lang": "sl", "supportURL": "https://github.com/betterwebleon/slovenian-list" + }, + "https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-block-filters.txt": { + "off": true, + "title": "ROU: Romanian Ad (ROad) Block List", + "group": "regions", + "lang": "ro", + "supportURL": "https://github.com/tcptomato/ROad-Block" } }