attempt to minimize future conflicts

Author: folkertdev

tests/ui/simd/intrinsic/float-math-pass.rs

@@ -17,6 +17,15 @@ struct f32x4(pub [f32; 4]);
 
 use std::intrinsics::simd::*;
 
+<<<<<<< HEAD
+=======
+#[rustc_intrinsic]
+unsafe fn simd_fpow<T>(x: T, y: T) -> T;
+
+#[rustc_intrinsic]
+unsafe fn simd_fpowi<T>(x: T, y: i32) -> T;
+
+>>>>>>> f48829bd978 (attempt to minimize future conflicts)
 macro_rules! assert_approx_eq_f32 {
     ($a:expr, $b:expr) => {{
         let (a, b) = (&$a, &$b);