Merge pull request #835 from ansonj/fix-spelling-typo

Fix typo ("conjuncion" --> "conjunction")
ReactiveCocoa · Jul 22, 2021 · d861efd · d861efd
2 parents 2c06e94 + e3b3c45
commit d861efd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 

diff --git a/Sources/Lifetime.swift b/Sources/Lifetime.swift
@@ -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.
 	///
 	/// ```