Resolving merge conflict about icons

vishnuravi · vishnuravi · commit 16c546b242c3 · 2025-01-28T20:51:57.000-05:00
diff --git a/CS342ExampleApplication/Onboarding/Welcome.swift b/CS342ExampleApplication/Onboarding/Welcome.swift
@@ -21,11 +21,7 @@ struct Welcome: View {
             areas: [
                 OnboardingInformationView.Content(
                     icon: {
-<<<<<<< HEAD
                         Image(systemName: "staroflife.fill")
-=======
-                        Image(systemName: "cat.fill")
->>>>>>> c01cd8b3f4215dcbe9a6803691bc60de14e8af8d
                             .accessibilityHidden(true)
                     },
                     title: "Cats are great!",
