From 49bd5033083f8ff7d8ef6495d996dabeec3ba768 Mon Sep 17 00:00:00 2001
From: Antonio Sanchez <cantonios@google.com>
Date: Mon, 3 Mar 2025 15:21:02 -0800
Subject: [PATCH] Fix merge conflict error

---
 ci/build.linux.gitlab-ci.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml
index fedb90606..a5916f0eb 100644
--- a/ci/build.linux.gitlab-ci.yml
+++ b/ci/build.linux.gitlab-ci.yml
@@ -314,34 +314,6 @@ build:linux:cross:ppc64le:clang-12:default:
     EIGEN_CI_CXX_COMPILER: clang++-12
     EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12
 
-<<<<<<< HEAD
-=======
-######## loongarch64 #################################################
-
-.build:linux:cross:loongarch64:
-  extends: .build:linux:cross
-  variables:
-    EIGEN_CI_TARGET_ARCH: loongarch64
-    EIGEN_CI_CROSS_TARGET_TRIPLE: loongarch64-linux-gnu
-  tags:
-    - eigen-runner
-    - linux
-    - x86-64
-
-# GCC-14 (minimum on Ubuntu 24)
-build:linux:cross:loongarch64:gcc-14:default:
-  extends: .build:linux:cross:loongarch64
-  image: ubuntu:24.04
-  variables:
-    EIGEN_CI_CROSS_INSTALL: g++-14-loongarch64-linux-gnu
-    EIGEN_CI_CROSS_C_COMPILER: loongarch64-linux-gnu-gcc-14
-    EIGEN_CI_CROSS_CXX_COMPILER: loongarch64-linux-gnu-g++-14
-    EIGEN_CI_ADDITIONAL_ARGS: >-
-      -DCMAKE_SYSTEM_NAME=Linux
-      -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-loongarch64-static;-L;/usr/loongarch64-linux-gnu
-      -DEIGEN_TEST_LSX=on
-
->>>>>>> 9589cc4e7 (Fix loongarch64 emulated tests.)
 ######## MR Smoke Tests ########################################################
 
 build:linux:cross:x86-64:gcc-10:default:smoketest: