Conflicts: README.md app/build.gradle app/src/main/AndroidManifest.xml app/src/main/res/values/colors.xml app/src/main/res/values/styles.xml |
||
---|---|---|
.. | ||
runConfigurations.xml |
Conflicts: README.md app/build.gradle app/src/main/AndroidManifest.xml app/src/main/res/values/colors.xml app/src/main/res/values/styles.xml |
||
---|---|---|
.. | ||
runConfigurations.xml |