合并成功

wxr

2021-11-18 dd3f6db0cb3c242758ab0000a0513e093f02531c

1
2
3
4
5
6
7
<?xml version="1.0" encoding="UTF-8"?>
<resources>
    <dimen name="fab_margin">16dp</dimen>
    <dimen name="titleTextSize">25sp</dimen>
    <dimen name="tipTextSize">14sp</dimen>
    <dimen name="tipTitleTextSize">16sp</dimen>
</resources>