Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 gnu/gcc/HISTORY |    4 ++++
 gnu/gcc/PREPARE |   19 -------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit c3623ed9be80d183ff85d4b3bf2b73a5a27e074f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    gcc: Remove conflict markers

diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 53b9432..a3084f2 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2026-08-23 Ismael Luceno <ismael AT sourcemage.org>
+       * PREPARE: removed conflict markers left in by the gcc-10 and
+         gcc-14 merge
+
 2026-08-16 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS; WATCH: added WATCH file and dropped the Watch line
 
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index 02ffdf9..e96a8e8 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -25,31 +25,12 @@ fi &&
 
 config_query_multi GCC_COMPILER "Select the additional compilers you want" \
                                 none \
-                                ada \
-                                brig \
-                                d \
-                                fortran \
-                                go \
-                                jit \
-                                objc \
-                                obj-c++ \
                                 $GCC_LANGUAGES \
                                 all &&
 list_remove GCC_COMPILER none    &&
 if list_find "$GCC_COMPILER" "all" ; then
   list_remove GCC_COMPILER all   &&
-<<<<<<< HEAD
-  list_add GCC_COMPILER ada      &&
-  list_add GCC_COMPILER brig     &&
-  list_add GCC_COMPILER d        &&
-  list_add GCC_COMPILER fortran  &&
-  list_add GCC_COMPILER go       &&
-  list_add GCC_COMPILER jit      &&
-  list_add GCC_COMPILER objc     &&
-  list_add GCC_COMPILER obj-c++
-=======
   for language in $GCC_LANGUAGES; do
     list_add GCC_COMPILER $language
   done
->>>>>>> 278701bec907 (gcc: Merge gcc-10 and gcc-14 in as slots)
 fi