fixed merge errors from #1166

This commit is contained in:
gorhill 2016-01-12 12:49:43 -05:00
parent db790c226b
commit 68c2d1af34
2 changed files with 8 additions and 1 deletions

View File

@ -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

View File

@ -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"
}
}