.idea/deploymentTargetDropDown.xml
0 → 100644
+17
−0
+37
−0
+17
−0
Loading
Conflicts: .idea/gradle.xml .idea/misc.xml app/build.gradle app/src/main/AndroidManifest.xml app/src/main/res/layout/activity_main.xml app/src/main/res/values-night/themes.xml app/src/main/res/values/strings.xml app/src/main/res/values/themes.xml gradle/wrapper/gradle-wrapper.properties settings.gradle