[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-protected at write: misspelled one test name so it wasn't updated (e2129683)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : TL21-2-protected at write
Link       : https://github.com/latex3/latex2e/commit/e2129683401a9cb8be2db239271d195c88a5071b

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

commit e2129683401a9cb8be2db239271d195c88a5071b
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Jul 16 23:56:12 2021 +0200

    misspelled one test name so it wasn't updated


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

e2129683401a9cb8be2db239271d195c88a5071b
 base/testfiles-TU/tu-textcomp-003.luatex.tlg | 20 --------------------
 base/testfiles-TU/tu-textcomp-003.tlg        | 20 --------------------
 2 files changed, 40 deletions(-)

diff --git a/base/testfiles-TU/tu-textcomp-003.luatex.tlg b/base/testfiles-TU/tu-textcomp-003.luatex.tlg
index 603abd88..fd323388 100644
--- a/base/testfiles-TU/tu-textcomp-003.luatex.tlg
+++ b/base/testfiles-TU/tu-textcomp-003.luatex.tlg
@@ -196,11 +196,7 @@ Completed box being shipped out [1]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Available out of the box, i.e., just using fontspec --- not quite right yet with TU}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -2080,11 +2076,7 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Not known without textcomp}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -3004,11 +2996,7 @@ Completed box being shipped out [3]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {3}Accents like \protect \dots  {} mostly unknown}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -3578,11 +3566,7 @@ Completed box being shipped out [4]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {4}Except these too}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -3761,11 +3745,7 @@ Completed box being shipped out [4]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {5}And there is oldstylenums}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
diff --git a/base/testfiles-TU/tu-textcomp-003.tlg b/base/testfiles-TU/tu-textcomp-003.tlg
index 4a8e8564..87b86052 100644
--- a/base/testfiles-TU/tu-textcomp-003.tlg
+++ b/base/testfiles-TU/tu-textcomp-003.tlg
@@ -86,11 +86,7 @@ Completed box being shipped out [1]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Available out of the box, i.e., just using fontspec --- not quite right yet with TU}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -1109,11 +1105,7 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Not known without textcomp}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -1562,11 +1554,7 @@ Completed box being shipped out [3]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {3}Accents like \protect \dots  {} mostly unknown}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -1902,11 +1890,7 @@ Completed box being shipped out [4]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {4}Except these too}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0
@@ -2013,11 +1997,7 @@ Completed box being shipped out [4]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-<<<<<<< HEAD
-...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberlin\ETC.}
-=======
 ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {5}And there is oldstylenums}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
 ...\penalty 10000
 ...\glue 9.913 plus 0.86198
 ...\glue(\parskip) 0.0 plus 1.0