diff --git a/android/.idea/modules/-195070525/capacitor-android.iml b/android/.idea/modules/-195070525/capacitor-android.iml index dcf9d76a4..34cffefc2 100644 --- a/android/.idea/modules/-195070525/capacitor-android.iml +++ b/android/.idea/modules/-195070525/capacitor-android.iml @@ -31,14 +31,14 @@ - - + + - - + + diff --git a/android/.idea/modules/app/app.iml b/android/.idea/modules/app/app.iml index 1401913da..143abc91c 100644 --- a/android/.idea/modules/app/app.iml +++ b/android/.idea/modules/app/app.iml @@ -30,9 +30,9 @@ - - + + diff --git a/android/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml b/android/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml index c325d2934..d9ca430d7 100644 --- a/android/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml +++ b/android/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml @@ -31,15 +31,15 @@ - - + + - - + + diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml index 710d34f1e..bd296029c 100644 --- a/android/.idea/workspace.xml +++ b/android/.idea/workspace.xml @@ -15,22 +15,259 @@ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> feature/chat +======= + + + >>>>>>> feature/chat - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD <<<<<<< HEAD @@ -150,15 +387,195 @@ ======= +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/chat - +<<<<<<< HEAD +>>>>>>> feature/chat +======= + + + + + + + + + + + + >>>>>>> feature/chat +<<<<<<< HEAD @@ -167,12 +584,28 @@ +======= + + + + + + + + + + + + + +>>>>>>> feature/chat <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> feature/pushNotifications @@ -186,10 +619,17 @@ >>>>>>> feature/pushNotifications +======= + + + + +>>>>>>> feature/chat +<<<<<<< HEAD <<<<<<< HEAD @@ -334,16 +774,285 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/chat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +<<<<<<< HEAD +>>>>>>> feature/chat +======= + + + + + + + + + + + + >>>>>>> feature/chat +<<<<<<< HEAD @@ -352,12 +1061,28 @@ +======= + + + + + + + + + + + + + +>>>>>>> feature/chat <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> feature/pushNotifications @@ -371,10 +1096,17 @@ >>>>>>> feature/pushNotifications +======= + + + + +>>>>>>> feature/chat +<<<<<<< HEAD <<<<<<< HEAD @@ -408,17 +1140,141 @@ >>>>>>> feature/pushNotifications +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> feature/chat