Removed page title for step count settings sheet, hopefully this will be enough to fix it not fitting for some

Author: xan-m

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsDatePicker.swift

@@ -22,32 +22,12 @@ struct StepSettingsSheetDatePicker: View {
 	}
 
 	var body: some View {
-<<<<<<< HEAD
-<<<<<<< HEAD
 		Text(NSLocalizedString("manually_add_step_count", comment: ""))
 			.font(.title2)
 			.padding()
 		DatePicker(NSLocalizedString("select_date", comment: ""), selection: $selectedDate, displayedComponents: [.date])
 			.padding()
 		TextField(NSLocalizedString("enter_number_of_steps", comment: ""), text: $addDateValue.value)
-=======
-		DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
-			.padding(.horizontal)
-		TextField("Enter Number of Steps", text: $addDateValue.value)
->>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
-=======
-		DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
-			.padding(.horizontal)
-		TextField("Enter Number of Steps", text: $addDateValue.value)
-=======
-		Text(NSLocalizedString("manually_add_step_count", comment: ""))
-			.font(.title2)
-			.padding()
-		DatePicker(NSLocalizedString("select_date", comment: ""), selection: $selectedDate, displayedComponents: [.date])
-			.padding()
-		TextField(NSLocalizedString("enter_number_of_steps", comment: ""), text: $addDateValue.value)
->>>>>>> main
->>>>>>> d738921 (resolving git issue)
 			.textFieldStyle(.roundedBorder)
 			.padding(.horizontal)
 			.keyboardType(.numberPad)

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsGoalChange.swift

@@ -22,24 +22,11 @@ struct StepSettingsSheetGoalChange: View {
 	}
 
 	var body: some View {
-<<<<<<< HEAD
-<<<<<<< HEAD
 		Text(NSLocalizedString("change_step_count_goal", comment: ""))
 			.font(.title2)
 			.padding()
 		TextField(NSLocalizedString("enter_step_goal", comment: ""), text: $setStepGoal.value)
-=======
-		TextField("Enter Step Goal", text: $setStepGoal.value)
->>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
-=======
-		TextField("Enter Step Goal", text: $setStepGoal.value)
-=======
-		Text(NSLocalizedString("change_step_count_goal", comment: ""))
-			.font(.title2)
-			.padding()
-		TextField(NSLocalizedString("enter_step_goal", comment: ""), text: $setStepGoal.value)
->>>>>>> main
->>>>>>> d738921 (resolving git issue)
+
 			.textFieldStyle(.roundedBorder)
 			.padding()
 			.keyboardType(.numberPad)

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepsSettingsSheet.swift

@@ -15,21 +15,6 @@ struct StepSettingsSheet: View {
 	var body: some View {
 		VStack (alignment: .leading) {
 			SheetCloseButton()
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> d738921 (resolving git issue)
-			Text(NSLocalizedString("steps_settings", comment: ""))
-				.font(.largeTitle)
-				.padding()
-				.padding(.bottom, 20)
-<<<<<<< HEAD
-=======
->>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
-=======
->>>>>>> main
->>>>>>> d738921 (resolving git issue)
 			Picker("", selection: $pickerState) {
 				Text(NSLocalizedString("step_goal", comment: "")).tag(0)
 				Text(NSLocalizedString("add_steps", comment: "")).tag(1)