solve some merge conflicts

MediaTo-SDP · Apr 21, 2023 · 272ec55 · 272ec55
2 parents 35b4392 + 79e876d
commit 272ec55
Show file tree

Hide file tree

Showing 86 changed files with 3,851 additions and 1,246 deletions.
diff --git a/.fleet/settings.json b/.fleet/settings.json
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,10 @@ local.properties
 /secret.local
 secret.local
 firebase-debug.log
-database-debug.log
+database-debug.log
+.idea/deploymentTargetDropDown.xml
+app/src/main/assets/
+database.rules.json
+q
+storage.rules
+
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/.idea/other.xml b/.idea/other.xml