fix conflict
This commit is contained in:
commit
0b5abae44f
1 changed files with 2 additions and 0 deletions
|
@ -678,4 +678,6 @@
|
|||
<string name="lock_screen_short">Lock</string>
|
||||
<string name="sensitivity_warning">By turning on Autosense feature remember to enter all eated carbs. Otherwise carbs deviations will be identified wrong as sensitivity change !!</string>
|
||||
<string name="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
|
||||
<string name="mdtp_ok">OK</string>
|
||||
<string name="mdtp_cancel">Cancel</string>
|
||||
</resources>
|
||||
|
|
Loading…
Reference in a new issue