From daf695ccc98980527c40d3a5352d5429c1277552 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 18 Feb 2023 12:08:57 -0500 Subject: [PATCH 1/2] Resolve bad merge artifacts from a previous merge. --- Shared/Secrets.swift.gyb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Shared/Secrets.swift.gyb b/Shared/Secrets.swift.gyb index 5b7814cb1..05b993a20 100644 --- a/Shared/Secrets.swift.gyb +++ b/Shared/Secrets.swift.gyb @@ -2,15 +2,7 @@ %{ import os -<<<<<<< HEAD -<<<<<<< HEAD -secrets = ['MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'TWITTER_CONSUMER_KEY', 'TWITTER_CONSUMER_SECRET', 'REDDIT_CONSUMER_KEY', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] -======= -secrets = ['FEED_WRANGLER_KEY', 'MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'REDDIT_CONSUMER_KEY', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] ->>>>>>> mac-release -======= -secrets = ['FEED_WRANGLER_KEY', 'MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'REDDIT_CONSUMER_KEY', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] ->>>>>>> ios-release +secrets = ['MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'REDDIT_CONSUMER_KEY', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] def chunks(seq, size): return (seq[i:(i + size)] for i in range(0, len(seq), size)) From 09a8b702cb310f8a71d3a1e4ab5a3d38a83a8d5c Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 18 Feb 2023 17:52:23 -0500 Subject: [PATCH 2/2] 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