Aran Zaiger
d57f338207
# Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_4_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
copyright | ||
inspectionProfiles | ||
libraries | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
gradle.xml | ||
misc.xml | ||
modules.xml | ||
runConfigurations.xml | ||
vcs.xml |