diff --git a/android/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/android/.gradle/6.1.1/fileHashes/resourceHashesCache.bin index 91d716c53..77714bf44 100644 Binary files a/android/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/android/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/android/.gradle/6.1.1/javaCompile/classAnalysis.bin b/android/.gradle/6.1.1/javaCompile/classAnalysis.bin index 04640e87e..57d94264d 100644 Binary files a/android/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/android/.gradle/6.1.1/javaCompile/classAnalysis.bin differ diff --git a/android/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/android/.gradle/6.1.1/javaCompile/jarAnalysis.bin index 178935c41..e10c3cd8f 100644 Binary files a/android/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/android/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ diff --git a/android/.gradle/6.1.1/javaCompile/taskHistory.bin b/android/.gradle/6.1.1/javaCompile/taskHistory.bin index 4195f137e..37e949d73 100644 Binary files a/android/.gradle/6.1.1/javaCompile/taskHistory.bin and b/android/.gradle/6.1.1/javaCompile/taskHistory.bin differ diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin index 3df8dab3d..1bf5070ab 100644 Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and b/android/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml index d3e4181af..bc3c9f666 100644 --- a/android/.idea/gradle.xml +++ b/android/.idea/gradle.xml @@ -7,7 +7,7 @@ diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml index 6816313f3..710d34f1e 100644 --- a/android/.idea/workspace.xml +++ b/android/.idea/workspace.xml @@ -15,6 +15,7 @@ +<<<<<<< HEAD <<<<<<< HEAD @@ -33,10 +34,117 @@ <<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/pushNotifications +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/pushNotifications @@ -51,19 +159,38 @@ + + + + + + + + <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> feature/pushNotifications +<<<<<<< HEAD +======= + + + + +>>>>>>> feature/pushNotifications +<<<<<<< HEAD @@ -71,10 +198,130 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/pushNotifications +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/pushNotifications @@ -97,19 +344,38 @@ + + + + + + + + <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> feature/pushNotifications +<<<<<<< HEAD +======= + + + + +>>>>>>> feature/pushNotifications +<<<<<<< HEAD @@ -117,13 +383,42 @@ ======= >>>>>>> feature/chat +======= + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/pushNotifications