From 09a8b702cb310f8a71d3a1e4ab5a3d38a83a8d5c Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 18 Feb 2023 17:52:23 -0500 Subject: [PATCH] Cleanup merge for DefaultFeeds.opml. I think that Brent's latest changes from 2e9107d67f9fd344b1a23b3ee453e1f1c5cbdf8f are probably representative of what he wanted to be the new normal going forward. --- Shared/Importers/DefaultFeeds.opml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Shared/Importers/DefaultFeeds.opml b/Shared/Importers/DefaultFeeds.opml index 9e809df40..04132dbaa 100644 --- a/Shared/Importers/DefaultFeeds.opml +++ b/Shared/Importers/DefaultFeeds.opml @@ -4,25 +4,6 @@ Default Feeds -<<<<<<< HEAD - - - - - - - - - - - - - - - - - -======= @@ -33,6 +14,5 @@ ->>>>>>> ios-release