Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

youtubelist.txt contains merge/diff artefacts #143

Open
ikarisan opened this issue Jun 18, 2023 · 0 comments · May be fixed by #148
Open

youtubelist.txt contains merge/diff artefacts #143

ikarisan opened this issue Jun 18, 2023 · 0 comments · May be fixed by #148

Comments

@ikarisan
Copy link

In line 15001 auf the youtubelist.txt file there is an artefact from an older merge:

r20---sn-4g5edndl.googlevideo.com
<<<<<<< HEAD
r1.sn-4g5edndl.googlevideo.com

This generates error messages in my blocky spam filter.
fuglede added a commit to fuglede/youTube_ads_4_pi-hole that referenced this issue Aug 5, 2024
@fuglede
Remove Git merge artifact
d69b8c4 
This closes kboghdady#143.
@fuglede fuglede linked a pull request Aug 5, 2024 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Remove Git merge artifact fuglede/youTube_ads_4_pi-hole
1 participant
@ikarisan