caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix conflict

Browse source
This commit is contained in:
Milos Kozak 2017-07-07 15:10:29 +02:00
parent 8de7e05dd5 2afdec3559
commit 0b5abae44f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/strings.xml
View file

@ -678,4 +678,6 @@
<string name="lock_screen_short">Lock</string> <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="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="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
<string name="mdtp_ok">OK</string>
<string name="mdtp_cancel">Cancel</string>
</resources> </resources>