Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/gradle.xml # .idea/jarRepositories.xml # .idea/misc.xml # .idea/modules.xml # build.gradle
No related branches found
No related tags found
Checking pipeline status
Showing
- .idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml 12 additions, 0 deletions..._com_android_support_localbroadcastmanager_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml 15 additions, 0 deletions...ibraries/Gradle__com_android_support_print_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml 12 additions, 0 deletions...dle__com_android_support_slidingpanelayout_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml 9 additions, 0 deletions...radle__com_android_support_support_annotations_28_0_0.xml
- .idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml 14 additions, 0 deletions...Gradle__com_android_support_support_compat_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml 12 additions, 0 deletions...radle__com_android_support_support_core_ui_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml 12 additions, 0 deletions...le__com_android_support_support_core_utils_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml 15 additions, 0 deletions...adle__com_android_support_support_fragment_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml 12 additions, 0 deletions...om_android_support_support_vector_drawable_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml 15 additions, 0 deletions...le__com_android_support_swiperefreshlayout_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml 16 additions, 0 deletions...android_support_test_espresso_espresso_core_3_0_2_aar.xml
- .idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml 16 additions, 0 deletions...port_test_espresso_espresso_idling_resource_3_0_2_aar.xml
- .idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml 16 additions, 0 deletions...es/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
- .idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml 16 additions, 0 deletions...ies/Gradle__com_android_support_test_runner_1_0_2_aar.xml
- .idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml 12 additions, 0 deletions...e__com_android_support_versionedparcelable_28_0_0_aar.xml
- .idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml 12 additions, 0 deletions...ries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
- .idea/modules/adenia-sensor-app.iml 19 additions, 0 deletions.idea/modules/adenia-sensor-app.iml
- .idea/modules/app/adenia-sensor-app.app.iml 87 additions, 0 deletions.idea/modules/app/adenia-sensor-app.app.iml
Loading
Please register or sign in to comment