Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix

This commit is contained in:
Jérôme Alves 2016-08-15 19:19:22 +02:00
commit cbb0ed5d29
1 changed files with 1 additions and 1 deletions

View File

@ -14,7 +14,7 @@ import RxCocoa
private struct ActivityToken<E> : ObservableConvertibleType, Disposable {
private let _source: Observable<E>
private let _dispose: AnonymousDisposable
private let _dispose: Cancelable
init(source: Observable<E>, disposeAction: () -> ()) {
_source = source