Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo ("conjuncion" --> "conjunction") #835

Merged
merged 1 commit into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# master
*Please add new entries at the top.*

1. Fixed spelling error in `Token` class documentation.

# 6.6.1
1. Updated Carthage xcconfig dependency to 1.1 for proper building arm64 macOS variants. (#826, kudos to @MikeChugunov)

Expand Down
2 changes: 1 addition & 1 deletion Sources/Lifetime.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ extension Lifetime {
/// A token object which completes its associated `Lifetime` when
/// it deinitializes, or when `dispose()` is called.
///
/// It is generally used in conjuncion with `Lifetime` as a private
/// It is generally used in conjunction with `Lifetime` as a private
/// deinitialization trigger.
///
/// ```
Expand Down