removed empty line, resolving merge conflict?

sweiland-openrails · sweiland-openrails · commit 3b7b1b6c9605 · 2024-10-07T20:25:08.000+02:00
diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs
@@ -632,7 +632,6 @@ private void trackLODBias_ValueChanged(object sender, EventArgs e)
                 labelLODBias.Text = catalog.GetStringFmt("All detail (+{0}%)", trackLODBias.Value);
         }
 
-
         private void checkAlerter_CheckedChanged(object sender, EventArgs e)
         {
             //Disable checkAlerterExternal when checkAlerter is not checked

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,6 @@ private void trackLODBias_ValueChanged(object sender, EventArgs e)`
`632`	`632`	`labelLODBias.Text = catalog.GetStringFmt("All detail (+{0}%)", trackLODBias.Value);`
`633`	`633`	`}`
`634`	`634`
`635`		`-`
`636`	`635`	`private void checkAlerter_CheckedChanged(object sender, EventArgs e)`
`637`	`636`	`{`
`638`	`637`	`//Disable checkAlerterExternal when checkAlerter is not checked`