diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin b/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin index dfc7101..13c7dd3 100644 Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin and b/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin differ diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock b/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock index 486f974..b12fee8 100644 Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock and b/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock differ diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin b/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin index 93b8eb7..f9b93e2 100644 Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin and b/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin differ diff --git a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml index 2e4d7ad..162d966 100644 --- a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml +++ b/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml index c2c61c0..21fe56b 100644 --- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml +++ b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml index e0fdb36..150f87c 100644 --- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml +++ b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/APK_SouceCode/.idea/workspace.xml b/APK_SouceCode/.idea/workspace.xml index 160a5cd..fc60676 100644 --- a/APK_SouceCode/.idea/workspace.xml +++ b/APK_SouceCode/.idea/workspace.xml @@ -27,10 +27,17 @@ +<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml +======= + + + +>>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml +<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml @@ -40,6 +47,44 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml