prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

try fix sync with upstream overriding local changes

Browse source
This commit is contained in:
Collin M. Barrett 2020-02-16 13:20:31 -06:00
parent bd549c9f4d
commit 12fed211e7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/FilterList.json
View file

@ -12,7 +12,7 @@
},
{
"id": 2,
"description": "Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.",
"description": "TEMP Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.",
"descriptionSourceUrl": "https://github.com/B-Con/mute",
"homeUrl": "https://github.com/B-Con/mute",
"issuesUrl": "https://github.com/B-Con/mute/issues",

2
server/azure-pipelines.migrate.yaml
View file

@ -87,7 +87,7 @@ steps:
git remote add upstream https://github.com/collinbarrett/FilterLists.git
git fetch upstream
git checkout master 'data/*.json' 'server/src/FilterLists.Data.Migrations/*'
git merge upstream/master
git rebase upstream/master
CONFLICTS=$(git ls-files -u | wc -l)
if [ "$CONFLICTS" -gt 0 ] ; then
echo "Data changes conflict with upstream master. Aborting..."