search

kboghdady / youTube_ads_4_pi-hole

YouTube script to add the new Ads list for Pi-hole
2.45k stars 266 forks source link

your blacklist file has merge diff in it #85

Closed wbsmolen closed 3 years ago

wbsmolen commented 3 years ago

see line 2161 in https://github.com/kboghdady/youTube_ads_4_pi-hole/blob/master/black.list

r20.sn-4g5e6nsd.googlevideo.com
<<<<<<< HEAD
r1---sn-5hnedn7l.googlevideo.com
r2---sn-5hnedn7l.googlevideo.com
r3---sn-5hnedn7l.googlevideo.com
r4---sn-5hnedn7l.googlevideo.com
r5---sn-5hnedn7l.googlevideo.com
r6---sn-5hnedn7l.googlevideo.com
r7---sn-5hnedn7l.googlevideo.com
r8---sn-5hnedn7l.googlevideo.com
r9---sn-5hnedn7l.googlevideo.com
r10---sn-5hnedn7l.googlevideo.com
r11---sn-5hnedn7l.googlevideo.com
r12---sn-5hnedn7l.googlevideo.com
r13---sn-5hnedn7l.googlevideo.com
r14---sn-5hnedn7l.googlevideo.com
r15---sn-5hnedn7l.googlevideo.com
r16---sn-5hnedn7l.googlevideo.com
r17---sn-5hnedn7l.googlevideo.com
r18---sn-5hnedn7l.googlevideo.com
r19---sn-5hnedn7l.googlevideo.com
r20---sn-5hnedn7l.googlevideo.com
r1---sn-nx57ynld.googlevideo.com
r2---sn-nx57ynld.googlevideo.com
r3---sn-nx57ynld.googlevideo.com
r4---sn-nx57ynld.googlevideo.com
r5---sn-nx57ynld.googlevideo.com
r6---sn-nx57ynld.googlevideo.com
r7---sn-nx57ynld.googlevideo.com
r8---sn-nx57ynld.googlevideo.com
r9---sn-nx57ynld.googlevideo.com
r10---sn-nx57ynld.googlevideo.com
r11---sn-nx57ynld.googlevideo.com
r12---sn-nx57ynld.googlevideo.com
r13---sn-nx57ynld.googlevideo.com
r14---sn-nx57ynld.googlevideo.com
r15---sn-nx57ynld.googlevideo.com
r16---sn-nx57ynld.googlevideo.com
r17---sn-nx57ynld.googlevideo.com
r18---sn-nx57ynld.googlevideo.com
r19---sn-nx57ynld.googlevideo.com
r20---sn-nx57ynld.googlevideo.com
r1---sn-a5meknee.googlevideo.com
r2---sn-a5meknee.googlevideo.com
r3---sn-a5meknee.googlevideo.com
r4---sn-a5meknee.googlevideo.com
r5---sn-a5meknee.googlevideo.com
r6---sn-a5meknee.googlevideo.com
r7---sn-a5meknee.googlevideo.com
r8---sn-a5meknee.googlevideo.com
r9---sn-a5meknee.googlevideo.com
r10---sn-a5meknee.googlevideo.com
r11---sn-a5meknee.googlevideo.com
r12---sn-a5meknee.googlevideo.com
r13---sn-a5meknee.googlevideo.com
r14---sn-a5meknee.googlevideo.com
r15---sn-a5meknee.googlevideo.com
r16---sn-a5meknee.googlevideo.com
r17---sn-a5meknee.googlevideo.com
r18---sn-a5meknee.googlevideo.com
r19---sn-a5meknee.googlevideo.com
r20---sn-a5meknee.googlevideo.com
r1---sn-p5qs7n7d.googlevideo.com
r2---sn-p5qs7n7d.googlevideo.com
r3---sn-p5qs7n7d.googlevideo.com
r4---sn-p5qs7n7d.googlevideo.com
r5---sn-p5qs7n7d.googlevideo.com
r6---sn-p5qs7n7d.googlevideo.com
r7---sn-p5qs7n7d.googlevideo.com
r8---sn-p5qs7n7d.googlevideo.com
r9---sn-p5qs7n7d.googlevideo.com
r10---sn-p5qs7n7d.googlevideo.com
r11---sn-p5qs7n7d.googlevideo.com
r12---sn-p5qs7n7d.googlevideo.com
r13---sn-p5qs7n7d.googlevideo.com
r14---sn-p5qs7n7d.googlevideo.com
r15---sn-p5qs7n7d.googlevideo.com
r16---sn-p5qs7n7d.googlevideo.com
r17---sn-p5qs7n7d.googlevideo.com
r18---sn-p5qs7n7d.googlevideo.com
r19---sn-p5qs7n7d.googlevideo.com
r20---sn-p5qs7n7d.googlevideo.com
=======
>>>>>>> d2f35f7df78db44100735cc9bb2b41a5eea3b26c
r1---sn-hp57knle.googlevideo.com
r2---sn-hp57knle.googlevideo.com
kboghdady commented 3 years ago

Thank you very much. I have fixed that