diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 29b052325..79dd2877c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,36 @@ +<<<<<<< HEAD +||||||| merged common ancestors + + + + + + + + +