remove merge conflict marker

LorrensP-2158466 · LorrensP-2158466 · commit 74068f2b2912 · 2025-02-08T17:33:46.000+01:00
diff --git a/tests/pass/float.rs b/tests/pass/float.rs
@@ -1239,7 +1239,6 @@ fn test_fmuladd() {
     test_operations_f32(0.1, 0.2, 0.3);
     test_operations_f64(1.1, 1.2, 1.3);
 }
-<<<<<<< HEAD
 
 /// `min` and `max` on equal arguments are non-deterministic.
 fn test_min_max_nondet() {

Original file line number	Diff line number	Diff line change
`@@ -1239,7 +1239,6 @@ fn test_fmuladd() {`
`1239`	`1239`	`test_operations_f32(0.1, 0.2, 0.3);`
`1240`	`1240`	`test_operations_f64(1.1, 1.2, 1.3);`
`1241`	`1241`	`}`
`1242`		`-<<<<<<< HEAD`
`1243`	`1242`
`1244`	`1243`	/// `min` and `max` on equal arguments are non-deterministic.
`1245`	`1244`	`fn test_min_max_nondet() {`