sync local branch with target

TopRichard · Oct 6, 2023 · f8cadf0 · f8cadf0
1 parent c7bf9b4
commit f8cadf0
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml
@@ -5,14 +5,11 @@ easyconfigs:
   - Bowtie2-2.4.5-GCC-11.3.0.eb
   - FastTree-2.1.11-GCCcore-11.3.0.eb
   - SAMtools-1.16.1-GCC-11.3.0.eb
-<<<<<<< HEAD
+  - gzip-1.12-GCCcore-11.3.0.eb
+  - lz4-1.9.3-GCCcore-11.3.0.eb
+  - zstd-1.5.2-GCCcore-11.3.0.eb
   - Pillow-9.1.1-GCCcore-11.3.0.eb:
       # avoid that hardcoded paths like /usr/include are used in build commands
         options:
           from-pr: 18881  
   - ASE-3.22.1-foss-2022a.eb
-=======
-  - gzip-1.12-GCCcore-11.3.0.eb
-  - lz4-1.9.3-GCCcore-11.3.0.eb
-  - zstd-1.5.2-GCCcore-11.3.0.eb
->>>>>>> 181dd0ac845922c4a35db32e874c75995735dd95