conflict message in black.list line 9021

kboghdady / youTube_ads_4_pi-hole

YouTube script to add the new Ads list for Pi-hole

2.45k stars 266 forks source link

conflict message in black.list line 9021 #99

Closed HuiMi24 closed 3 years ago

HuiMi24 commented 3 years ago

conflict message in black.list line 9021

<<<<<<< HEAD r1---sn-5uaeznr6.googlevideo.com

dishather commented 3 years ago

Similar artifacts in youtubelist.txt:

$ diff youtubelist.txt youtubelist_filtered.txt 2161d2160 < <<<<<<< HEAD 2242,2243d2240 < ======= < >>>>>>> d2f35f7df78db44100735cc9bb2b41a5eea3b26c 9224d9220 < >>>>>>> 87d416a3b02885ac656f2890cbe825b1df65fdf0