Skip to content

Commit

Permalink
refactor: Resolve rebase conflicts
Browse files Browse the repository at this point in the history
PIA-4595
  • Loading branch information
abolfazlimahdi committed Oct 30, 2023
1 parent b218878 commit a32ba46
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions RELEASE-ORDER.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ Release order for :bank-sdk:sdk 3.6.0:
3. :capture-sdk:sdk 3.6.0
4. :capture-sdk:default-network 3.6.0
5. :bank-sdk:sdk 3.6.0

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.google.android.material.textfield.TextInputLayout
import dagger.hilt.android.AndroidEntryPoint
import net.gini.android.bank.sdk.GiniBank
import net.gini.android.bank.sdk.exampleapp.R
import net.gini.android.bank.sdk.exampleapp.core.di.GiniCaptureNetworkServiceRelease
import net.gini.android.bank.sdk.exampleapp.core.di.GiniCaptureNetworkServiceDebugEnabled
import net.gini.android.bank.sdk.exampleapp.databinding.ActivityExtractionsBinding
import net.gini.android.capture.Amount
import net.gini.android.capture.AmountCurrency
Expand All @@ -42,7 +42,7 @@ class ExtractionsActivity : AppCompatActivity(), ExtractionsAdapter.ExtractionsA
private lateinit var mExtractionsAdapter: ExtractionsAdapter

@Inject
@GiniCaptureNetworkServiceRelease
@GiniCaptureNetworkServiceDebugEnabled
lateinit var defaultNetworkService: GiniCaptureDefaultNetworkService

// {extraction name} to it's {entity name}
Expand Down

0 comments on commit a32ba46

Please sign in to comment.