mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Finish merge of mac-release.
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -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
|
||||
|
||||
@@ -264,6 +264,5 @@ private extension Article {
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user