Merge branch 'simde_master' into qrdmlah

simd-everywhere · Oct 18, 2023 · 2dab3bd · 2dab3bd
1 parent 2a241e6
commit 2dab3bd
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -158,16 +158,13 @@ simde_neon_families = [
   'qdmulh_lane',
   'qdmulh_n',
   'qdmull',
-<<<<<<< HEAD
-=======
   'qdmull_high',
   'qdmull_high_lane',
   'qdmull_high_n',
   'qdmull_lane',
   'qdmull_n',
   'qrdmlah',
   'qrdmlsh',
->>>>>>> master
   'qrdmulh',
   'qrdmulh_lane',
   'qrdmulh_n',