caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix merge conflict 2

Browse source
This commit is contained in:
Milos Kozak 2016-11-11 13:09:50 +01:00
parent a341fa4343
commit c034f77b71
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,5 +342,4 @@
<string name="pumpNotInitialized">Pump not initialized!</string>
<string name="primefill">Prime/Fill</string>
<string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
>>>>>>> ad475ace90c312fb3e535740456d8305f597f889
</resources>