[latex3-commits] [git/LaTeX3-latex3-latex2e] gh825: removed leftover line from merge and added a bit more documentation (493c02d4)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh825
Link       : https://github.com/latex3/latex2e/commit/493c02d48ca474e609003cc2907c1fd1171c3675

>---------------------------------------------------------------

commit 493c02d48ca474e609003cc2907c1fd1171c3675
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat May 28 09:20:49 2022 +0200

    removed leftover line from merge and added a bit more documentation


>---------------------------------------------------------------

493c02d48ca474e609003cc2907c1fd1171c3675
 base/changes.txt | 1 -
 base/ltfiles.dtx | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/base/changes.txt b/base/changes.txt
index 2005de23..59966cb8 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -127,7 +127,6 @@ are not part of the distribution.
 
 	* latexrelease.dtx, ltexpl.dtx, ltcmd.dtx:
 	Move most make-harmless redefinitions right after ltexpl.dtx.
->>>>>>> develop
 
 2022-02-21  Joseph Wright  <Joseph.Wright at latex-project.org>
 
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index a2369d17..d99dfdcd 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -1651,6 +1651,11 @@
           \ifx\filename at ext\relax tex\else\filename at ext\fi}%
        \expandafter\let\expandafter\reserved at b
                               \csname ver@\reserved at a\endcsname
+%    \end{macrocode}
+%    Packages that \cs{relax} their \cs{ver at ...} string to allow for
+%    multiple loading (e.g., \pkg{fontenc}) can use \cs{ver@@...} to
+%    store the version information instead.
+%    \begin{macrocode}
        \ifx\reserved at b\relax
          \expandafter\let\expandafter\reserved at b
                          \csname ver@@\reserved at a\endcsname