997bba9ce3
# Conflicts: # app/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
colors.xml | ||
dimens.xml | ||
drawables.xml | ||
strings.xml | ||
styles.xml |
997bba9ce3
# Conflicts: # app/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
colors.xml | ||
dimens.xml | ||
drawables.xml | ||
strings.xml | ||
styles.xml |