fix merge
This commit is contained in:
parent
61097b3ac6
commit
6258d473b0
1 changed files with 1 additions and 1 deletions
|
@ -2,8 +2,8 @@ package info.nightscout.androidaps.utils
|
|||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.support.v7.app.AlertDialog
|
||||
import android.text.Html
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import info.nightscout.androidaps.MainApp
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.data.DetailedBolusInfo
|
||||
|
|
Loading…
Reference in a new issue