From 1f834f858e8cdcb4114969867f491f97813076ee Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Fri, 2 Jul 2021 15:46:25 -0400
Subject: Fix small build issue.

---
 ios/Frontend/Info.plist | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'ios/Frontend')

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>
-- 
cgit v1.2.3-70-g09d2