From 6004ccdba0174d1048853b400d594ca293f131fd Mon Sep 17 00:00:00 2001 From: minoplhy Date: Sun, 1 Aug 2021 00:18:31 +0700 Subject: [PATCH] resolve conflict --- filters.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filters.sh b/filters.sh index 02df3a8..d54d0e4 100644 --- a/filters.sh +++ b/filters.sh @@ -1,7 +1,7 @@ #!/bin/bash -git clone https://github.com/minoplhy/filters-maker /filters-maker -git clone https://x-access-token:$API_TOKEN_GITHUB@github.com/$Destination_REPO.git /$Destination_NAME -cd / +git clone https://github.com/minoplhy/filters-maker ./filters-maker +git clone https://x-access-token:$API_TOKEN_GITHUB@github.com/$Destination_REPO.git ./$Destination_NAME +>>>>>>> d43f04f (Create filters.sh) filters-maker/crawler.py filters-maker/input/domains.txt filters-maker/maker-rpz.py filtes-maker/input/domains.txt $Destination_REPO/$Destination_VERSION/rpz.txt cd $Destination_REPO