Skip to content

Remove conflict resolution garbage #126

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

Open
robsantini wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove conflict resolution garbage #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions youtubelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14998,7 +14998,6 @@ r17---sn-4g5edndl.googlevideo.com
r18---sn-4g5edndl.googlevideo.com
r19---sn-4g5edndl.googlevideo.com
r20---sn-4g5edndl.googlevideo.com
<<<<<<< HEAD
r1.sn-4g5edndl.googlevideo.com
r2.sn-4g5edndl.googlevideo.com
r3.sn-4g5edndl.googlevideo.com
Expand Down Expand Up @@ -16454,9 +16453,6 @@ rr4.sn-o097znsk.googlevideo.com
rr4---sn-o097znsr.googlevideo.com
rr4.sn-o097znsr.googlevideo.com
r4.sn-a5mlrn7k.googlevideo.com
=======
rr3---sn-jvhj5nu-nh4s.googlevideo.com
>>>>>>> 6dbd05af56bad9d2acdfb67ff9c9b1d5f0e1da7a
rr6---sn-a5mekner.googlevideo.com
rr6.sn-a5mekner.googlevideo.com
rr5---sn-o097znsk.googlevideo.com
Expand Down