From 5755dd08444483770513b7a5b7edb95af094006c Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 1 Mar 2020 16:33:05 -0800 Subject: [PATCH] Finish merge of mac-release. --- .gitignore | 6 ------ Shared/Article Rendering/ArticleRenderer.swift | 1 - 2 files changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index a8f61c017..51163b4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -69,13 +69,7 @@ fastlane/Preview.html fastlane/screenshots fastlane/test_output -<<<<<<< HEAD /Shared/Secrets.swift *.py[cod] -======= -/Shared/Secrets.swift -*.py[cod] - ->>>>>>> mac-release diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift index 50a9204b6..92f0de19c 100644 --- a/Shared/Article Rendering/ArticleRenderer.swift +++ b/Shared/Article Rendering/ArticleRenderer.swift @@ -264,6 +264,5 @@ private extension Article { } return url } - }