mirror of
https://github.com/Ranchero-Software/NetNewsWire.git
synced 2024-12-18 12:28:37 +01:00
Finish merge of mac-release.
This commit is contained in:
parent
94c6ca428f
commit
5755dd0844
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
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user