From 2dab3bdd62a950d787608e15b1983fd6bc0bf239 Mon Sep 17 00:00:00 2001
From: eric900115 <eric20607@gmail.com>
Date: Wed, 18 Oct 2023 15:23:34 +0800
Subject: [PATCH] Merge branch 'simde_master' into qrdmlah

---
 meson.build | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meson.build b/meson.build
index a86177dc8..e0cd82b87 100644
--- a/meson.build
+++ b/meson.build
@@ -158,8 +158,6 @@ simde_neon_families = [
   'qdmulh_lane',
   'qdmulh_n',
   'qdmull',
-<<<<<<< HEAD
-=======
   'qdmull_high',
   'qdmull_high_lane',
   'qdmull_high_n',
@@ -167,7 +165,6 @@ simde_neon_families = [
   'qdmull_n',
   'qrdmlah',
   'qrdmlsh',
->>>>>>> master
   'qrdmulh',
   'qrdmulh_lane',
   'qrdmulh_n',