Resolved remaining merge conflict

Sven · Sven · commit f21326e72c2c · 2025-09-04T15:43:24.000+02:00
diff --git a/ReaderWriter/3rdPartyFormatAdapters/GCODE/GCodeReaderWriter/GCodeWriter.cs b/ReaderWriter/3rdPartyFormatAdapters/GCODE/GCodeReaderWriter/GCodeWriter.cs
@@ -461,9 +461,4 @@ private void CheckConsistence(int number1, int number2)
             }
         }
     }
-<<<<<<< HEAD
 }
-=======
-}
-
->>>>>>> gcode_writer

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,4 @@ private void CheckConsistence(int number1, int number2)`
`461`	`461`	`}`
`462`	`462`	`}`
`463`	`463`	`}`
`464`		`-<<<<<<< HEAD`
`465`	`464`	`}`
`466`		`-=======`
`467`		`-}`
`468`		`-`
`469`		`->>>>>>> gcode_writer`