Skip to content

Commit ad33393

Browse files
authored
Merge branch 'test' into MatthewFlippen
2 parents e3dd1eb + 4837354 commit ad33393

File tree

36 files changed

+115
-85
lines changed

36 files changed

+115
-85
lines changed

.DS_Store

6 KB
Binary file not shown.

ACE_Application/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ACE_Application/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)