From fcda89f6b6c68f12c92a6f37f9038c78141d2e0d Mon Sep 17 00:00:00 2001 From: LaneSh4d0w <30985701+LaneSh4d0w@users.noreply.github.com> Date: Sat, 16 Jan 2021 17:44:03 +0100 Subject: [PATCH] US : Fix a Git quack --- channels/us.m3u | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/channels/us.m3u b/channels/us.m3u index f0ea480a9..ce00e364a 100644 --- a/channels/us.m3u +++ b/channels/us.m3u @@ -931,13 +931,9 @@ https://na-all23.secdn.net/pegstream3-live/play/65ea794b-dd82-41ce-8e98-a9177289 https://a.jsrdn.com/broadcast/4hhfi556/indexR720P.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="https://i.imgur.com/tbcqI3o.jpg" group-title="Sport",US SPORT Tennis Plus 1 https://playoutengine.sinclairstoryline.com/playout/f2f8b269-dd85-4434-bdd3-b3a64ca9cd60/g.m3u8 -<<<<<<< HEAD -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="https://i.imgur.com/FzxuNhl.png" group-title="Local",KVVB-TV 33 -======= #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="" group-title="",USA Network https://cdn008.teleuptv.net/JnVLClgyvD/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="https://i.imgur.com/FzxuNhl.png" group-title="Local",Victorville | KVVB-TV 33 ->>>>>>> d5a680156a1edfcb7e12489ef290e653deba9b5e +#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="https://i.imgur.com/FzxuNhl.png" group-title="Local",KVVB-TV 33 https://2-fss-2.streamhoster.com/pl_138/amlst:201950-1309230/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="English" tvg-logo="" group-title="Religious",Victory Television Network http://184.173.179.163:1935/victorytelevisionnetwork/victorytelevisionnetwork/playlist.m3u8