Merge pull request #5876 from jdmcgrath-az/spelling-error

Byron · web-flow · commit d6c81c757b86 · 2025-01-01T10:07:17.000+01:00
fix: correct spelling of "ammended" to "amended" in tooltip
diff --git a/apps/desktop/src/lib/commit/CommitCard.svelte b/apps/desktop/src/lib/commit/CommitCard.svelte
@@ -318,7 +318,7 @@
 
 					{#if conflicted}
 						<Tooltip
-							text={"Conflicted commits must be resolved before they can be ammended or squashed.\nPlease resolve conflicts using the 'Resolve conflicts' button"}
+							text={"Conflicted commits must be resolved before they can be amended or squashed.\nPlease resolve conflicts using the 'Resolve conflicts' button"}
 						>
 							<div class="commit__conflicted">
 								<Icon name="warning-small" />

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@`
`318`	`318`
`319`	`319`	`{#if conflicted}`
`320`	`320`	`<Tooltip`
`321`		`- text={"Conflicted commits must be resolved before they can be ammended or squashed.\nPlease resolve conflicts using the 'Resolve conflicts' button"}`
	`321`	`+ text={"Conflicted commits must be resolved before they can be amended or squashed.\nPlease resolve conflicts using the 'Resolve conflicts' button"}`
`322`	`322`	`>`
`323`	`323`	`<div class="commit__conflicted">`
`324`	`324`	`<Icon name="warning-small" />`