1.0.13.13: Actually export RESOLVE-CONFLICT et al from SB-EXT

[sbcl.git] / package-data-list.lisp-expr

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 24d4e26..646947b 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -637,6 +637,10 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
                "IMPLICIT-GENERIC-FUNCTION-WARNING"
                "INVALID-FASL"
 
+               "NAME-CONFLICT" "NAME-CONFLICT-FUNCTION"
+               "NAME-CONFLICT-DATUM" "NAME-CONFLICT-SYMBOLS"
+               "RESOLVE-CONFLICT"
+
                ;; and a mechanism for controlling same at compile time
                "MUFFLE-CONDITIONS" "UNMUFFLE-CONDITIONS"
 
@@ -954,10 +958,6 @@ possibly temporariliy, because it might be used internally."
                "FORMAT-TOO-MANY-ARGS-WARNING" "EXTENSION-FAILURE"
                "STRUCTURE-INITARG-NOT-KEYWORD" "CONSTANT-MODIFIED"
 
-               "NAME-CONFLICT" "NAME-CONFLICT-FUNCTION"
-               "NAME-CONFLICT-DATUM" "NAME-CONFLICT-SYMBOLS"
-               "RESOLVE-CONFLICT"
-
                ;; ..and DEFTYPEs..
                "INDEX" "LOAD/STORE-INDEX"
                "SIGNED-BYTE-WITH-A-BITE-OUT"