diff options
Diffstat (limited to 'ios/Frontend')
| -rw-r--r-- | ios/Frontend/Info.plist | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ios/Frontend/Info.plist b/ios/Frontend/Info.plist index b04df4b4..bf077fca 100644 --- a/ios/Frontend/Info.plist +++ b/ios/Frontend/Info.plist @@ -56,15 +56,12 @@ <string></string> <key>NSMainNibFile</key> <string>LaunchScreen</string> -<<<<<<< HEAD <key>NSMicrophoneUsageDescription</key> <string>Enable microphone access to record and listen to videos</string> <key>NSPhotoLibraryAddUsageDescription</key> <string>This lets you save photos captured on Tagg, to your library</string> <key>NSPhotoLibraryUsageDescription</key> <string>This lets you share photos from your library and select profile displays</string> -======= ->>>>>>> master <key>UIAppFonts</key> <array> <string>Feather.ttf</string> |