diff --git a/android/.gradle/6.1.1/executionHistory/executionHistory.bin b/android/.gradle/6.1.1/executionHistory/executionHistory.bin index 322864d09..4ef066559 100644 Binary files a/android/.gradle/6.1.1/executionHistory/executionHistory.bin and b/android/.gradle/6.1.1/executionHistory/executionHistory.bin differ diff --git a/android/.gradle/6.1.1/executionHistory/executionHistory.lock b/android/.gradle/6.1.1/executionHistory/executionHistory.lock index 76b758c67..46676a6b5 100644 Binary files a/android/.gradle/6.1.1/executionHistory/executionHistory.lock and b/android/.gradle/6.1.1/executionHistory/executionHistory.lock differ diff --git a/android/.gradle/6.1.1/fileHashes/fileHashes.bin b/android/.gradle/6.1.1/fileHashes/fileHashes.bin index 6c0b793f8..35463dc1a 100644 Binary files a/android/.gradle/6.1.1/fileHashes/fileHashes.bin and b/android/.gradle/6.1.1/fileHashes/fileHashes.bin differ diff --git a/android/.gradle/6.1.1/fileHashes/fileHashes.lock b/android/.gradle/6.1.1/fileHashes/fileHashes.lock index 6a8601d68..df6f928fa 100644 Binary files a/android/.gradle/6.1.1/fileHashes/fileHashes.lock and b/android/.gradle/6.1.1/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1d990c5a6..c288a1089 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml new file mode 100644 index 000000000..61a9130cd --- /dev/null +++ b/android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml index f1f84943b..58cdbbba2 100644 --- a/android/.idea/gradle.xml +++ b/android/.idea/gradle.xml @@ -7,7 +7,7 @@ diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/android/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml index bd296029c..e948d31d0 100644 --- a/android/.idea/workspace.xml +++ b/android/.idea/workspace.xml @@ -16,6 +16,8 @@ <<<<<<< HEAD +======= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -277,19 +279,17 @@ +>>>>>>> developer - - - - - - - - - + + +<<<<<<< HEAD + + +======= @@ -315,11 +315,14 @@ >>>>>>> feature/pushNotifications +>>>>>>> developer <<<<<<< HEAD +======= +<<<<<<< HEAD ======= @@ -560,8 +563,12 @@ ======= +>>>>>>> developer +<<<<<<< HEAD + +======= @@ -625,10 +632,14 @@ >>>>>>> feature/chat +>>>>>>> developer +<<<<<<< HEAD + +======= <<<<<<< HEAD <<<<<<< HEAD @@ -661,15 +672,13 @@ +>>>>>>> developer - - - - - - - +<<<<<<< HEAD + + +======= @@ -1037,8 +1046,12 @@ ======= +>>>>>>> developer +<<<<<<< HEAD + +======= @@ -1102,10 +1115,15 @@ >>>>>>> feature/chat +>>>>>>> developer +<<<<<<< HEAD + + +======= <<<<<<< HEAD <<<<<<< HEAD @@ -1260,12 +1278,16 @@ >>>>>>> feature/chat +>>>>>>> developer