Fix rebase errors

This commit is contained in:
moezbhatti
2019-08-21 23:10:27 +02:00
parent cb0af93594
commit d8fbb324a2
6 changed files with 10 additions and 7 deletions
@@ -24,7 +24,8 @@ import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject
@@ -8,7 +8,8 @@ import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject
@@ -20,7 +20,8 @@ package com.moez.QKSMS.feature.blocking.numbers
import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.repository.BlockingRepository
import com.uber.autodispose.kotlin.autoDisposable
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import javax.inject.Inject
class BlockedNumbersPresenter @Inject constructor(