fix: resolve merge conflict markers in mobile/app.json

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-16 18:28:15 +00:00
parent 5b09b7b9ae
commit a7b993ad42
-16
View File
@@ -22,7 +22,6 @@
"NSCameraUsageDescription": "DocuElevate uses the camera to capture documents for upload.", "NSCameraUsageDescription": "DocuElevate uses the camera to capture documents for upload.",
"NSPhotoLibraryUsageDescription": "DocuElevate accesses your photo library to select documents for upload.", "NSPhotoLibraryUsageDescription": "DocuElevate accesses your photo library to select documents for upload.",
"NSPhotoLibraryAddUsageDescription": "DocuElevate saves scanned documents to your photo library.", "NSPhotoLibraryAddUsageDescription": "DocuElevate saves scanned documents to your photo library.",
<<<<<<< Updated upstream
"UIBackgroundModes": ["fetch", "remote-notification"], "UIBackgroundModes": ["fetch", "remote-notification"],
"ITSAppUsesNonExemptEncryption": false, "ITSAppUsesNonExemptEncryption": false,
"LSSupportsOpeningDocumentsInPlace": true, "LSSupportsOpeningDocumentsInPlace": true,
@@ -48,15 +47,6 @@
] ]
}, },
"buildNumber": "7" "buildNumber": "7"
=======
"UIBackgroundModes": [
"fetch",
"remote-notification"
],
"ITSAppUsesNonExemptEncryption": false
},
"buildNumber": "6"
>>>>>>> Stashed changes
}, },
"android": { "android": {
"adaptiveIcon": { "adaptiveIcon": {
@@ -105,13 +95,7 @@
{ {
"icon": "./assets/notification-icon.png", "icon": "./assets/notification-icon.png",
"color": "#1e40af", "color": "#1e40af",
<<<<<<< Updated upstream
"sounds": ["./assets/notification_sound.wav"] "sounds": ["./assets/notification_sound.wav"]
=======
"sounds": [
"./assets/notification-sound.wav"
]
>>>>>>> Stashed changes
} }
], ],
[ [