From 469b3d766bcb166edadb2ca734415c468e83ccbc Mon Sep 17 00:00:00 2001
From: "svcusr-spack (Resp. Germann Elsa Sylvia)"
 <svcusr-spack@gpu001.merlin7.psi.ch>
Date: Thu, 13 Mar 2025 09:03:03 +0100
Subject: [PATCH] FIX: forgotten merge

---
 env/sles15/aarch64/sysconfigs/packages.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml
index cbe4e96..8bcb169 100644
--- a/env/sles15/aarch64/sysconfigs/packages.yaml
+++ b/env/sles15/aarch64/sysconfigs/packages.yaml
@@ -32,10 +32,7 @@ packages:
   cce:
     externals:
       - modules:
-<<<<<<< Updated upstream
         - libfabric/1.22.0
-=======
->>>>>>> Stashed changes
         - PrgEnv-cray/8.5.0
         - cce/17.0.0
         spec: cce@=17.0.0