Resolving merge conflict about icons

Author: vishnuravi

CS342ExampleApplication.xcodeproj/xcshareddata/xcschemes/CS342ExampleApplication.xcscheme

@@ -79,7 +79,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "--disableFirebase"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--showOnboarding"
@@ -95,7 +95,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--useFirebaseEmulator"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
       <EnvironmentVariables>

CS342ExampleApplication/Onboarding/Welcome.swift

@@ -21,10 +21,14 @@ struct Welcome: View {
             areas: [
                 OnboardingInformationView.Content(
                     icon: {
+<<<<<<< HEAD
                         Image(systemName: "staroflife.fill")
+=======
+                        Image(systemName: "cat.fill")
+>>>>>>> c01cd8b3f4215dcbe9a6803691bc60de14e8af8d
                             .accessibilityHidden(true)
                     },
-                    title: "The Spezi Framework",
+                    title: "Cats are great!",
                     description: "WELCOME_AREA1_DESCRIPTION"
                 ),
                 OnboardingInformationView.Content(

CS342ExampleApplication/Resources/Localizable.xcstrings

@@ -81,6 +81,16 @@
         }
       }
     },
+    "CS342 Example Application" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Spezi\nCS342 Example Application"
+          }
+        }
+      }
+    },
     "Grant Access" : {
       "localizations" : {
         "en" : {
@@ -321,16 +331,6 @@
         }
       }
     },
-    "CS342 Example Application" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Spezi\nCS342 Example Application"
-          }
-        }
-      }
-    },
     "Start Questionnaire" : {
       "localizations" : {
         "en" : {
@@ -386,7 +386,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "The Spezi Framework builds the foundation of this application."
+            "value" : "Spezi is nice, but cats are nicer … they don’t care about SwiftLint!"
           }
         }
       }