[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-protected at write: fix a few more testfiles (f29ddff8)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Jul 16 23:02:22 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : TL21-2-protected at write
Link : https://github.com/latex3/latex2e/commit/f29ddff8a75577580774c70c8346e291780aa708
>---------------------------------------------------------------
commit f29ddff8a75577580774c70c8346e291780aa708
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Jul 16 23:02:22 2021 +0200
fix a few more testfiles
>---------------------------------------------------------------
f29ddff8a75577580774c70c8346e291780aa708
base/testfiles-TU/tu-tl2e7.luatex.tlg | 68 ---------------------------------
base/testfiles-TU/tu-tl2e7.tlg | 68 ---------------------------------
base/testfiles-legacy/tl2e7.tlg | 68 ---------------------------------
base/testfiles/tlb0027b.tlg | 44 ---------------------
base/testfiles/tlb0574.tlg | 8 ----
base/testfiles/vlatex03-2015.luatex.tlg | 20 ----------
base/testfiles/vlatex03-2015.tlg | 20 ----------
7 files changed, 296 deletions(-)
diff --git a/base/testfiles-TU/tu-tl2e7.luatex.tlg b/base/testfiles-TU/tu-tl2e7.luatex.tlg
index 746fef98..c9876038 100644
--- a/base/testfiles-TU/tu-tl2e7.luatex.tlg
+++ b/base/testfiles-TU/tu-tl2e7.luatex.tlg
@@ -54,11 +54,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}Test of grave accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -139,11 +135,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 {2}Test of acute accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -254,11 +246,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 {3}Test of check accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -346,11 +334,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 {4}Test of breve accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -418,11 +402,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 {5}Test of macron accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -489,11 +469,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 {6}Test of circumflex accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -572,11 +548,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 {7}Test of dot accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -655,11 +627,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 {8}Test of Hungarian accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -726,11 +694,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 {9}Test of tilde accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -805,11 +769,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 {10}Test of umlaut accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -914,11 +874,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 {11}Test of underbar accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -980,11 +936,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 {12}Test of cedilla accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -1063,11 +1015,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 {13}Test of dot under accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -1124,11 +1072,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 {14}Test with not name}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -1214,11 +1158,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 {15}Test of uppercase greek}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -1290,11 +1230,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 {16}Test of math accents}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -1420,11 +1356,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 {17}Test of roman text in math}{\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-tl2e7.tlg b/base/testfiles-TU/tu-tl2e7.tlg
index cc8203b2..d2345d13 100644
--- a/base/testfiles-TU/tu-tl2e7.tlg
+++ b/base/testfiles-TU/tu-tl2e7.tlg
@@ -31,11 +31,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}Test of grave accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -90,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 {2}Test of acute accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -177,11 +169,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 {3}Test of check accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -242,11 +230,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 {4}Test of breve accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -287,11 +271,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 {5}Test of macron accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -324,11 +304,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 {6}Test of circumflex accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -383,11 +359,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 {7}Test of dot accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -430,11 +402,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 {8}Test of Hungarian accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -475,11 +443,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 {9}Test of tilde accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -524,11 +488,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 {10}Test of umlaut accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -602,11 +562,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 {11}Test of underbar accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -639,11 +595,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 {12}Test of cedilla accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -690,11 +642,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 {13}Test of dot under accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -729,11 +677,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 {14}Test with not name}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -772,11 +716,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 {15}Test of uppercase greek}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -821,11 +761,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 {16}Test of math accents}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.913 plus 0.86198
...\glue(\parskip) 0.0 plus 1.0
@@ -923,11 +859,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 {17}Test of roman text in math}{\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-legacy/tl2e7.tlg b/base/testfiles-legacy/tl2e7.tlg
index 4bc37841..b4724d16 100644
--- a/base/testfiles-legacy/tl2e7.tlg
+++ b/base/testfiles-legacy/tl2e7.tlg
@@ -48,11 +48,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}Test of grave accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -123,11 +119,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 {2}Test of acute accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -228,11 +220,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 {3}Test of check accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -310,11 +298,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 {4}Test of breve accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -372,11 +356,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 {5}Test of macron accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -429,11 +409,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 {6}Test of circumflex accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -502,11 +478,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 {7}Test of dot accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -569,11 +541,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 {8}Test of Hungarian accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -630,11 +598,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 {9}Test of tilde accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -697,11 +661,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 {10}Test of umlaut accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1046,11 +1006,7 @@ Completed box being shipped out [2.256]
....\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 {11}Test of underbar accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1117,11 +1073,7 @@ Completed box being shipped out [2.256]
....\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 {12}Test of cedilla accent}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1196,11 +1148,7 @@ Completed box being shipped out [2.256]
....\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 {13}Test of other special characters}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1271,11 +1219,7 @@ Completed box being shipped out [2.256]
....\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 {14}Test of uppercase greek}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1335,11 +1279,7 @@ Completed box being shipped out [2.256]
....\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 {15}Test of math accents}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1453,11 +1393,7 @@ Completed box being shipped out [2.256]
....\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 {16}Test of roman text in math}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue(\parskip) 0.0 plus 1.0
@@ -1529,11 +1465,7 @@ Completed box being shipped out [2.256]
....\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 {17}Test of lccodes, uccodes and sfcodes}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90036 plus 0.86089
...\glue -2.7993
diff --git a/base/testfiles/tlb0027b.tlg b/base/testfiles/tlb0027b.tlg
index b09d6dd0..ac1add81 100644
--- a/base/testfiles/tlb0027b.tlg
+++ b/base/testfiles/tlb0027b.tlg
@@ -1095,11 +1095,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 {1}Section1}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 11.88335 plus 1.03331
...\glue(\parskip) 0.0 plus 1.0
@@ -1128,11 +1124,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 {subsection}{\protect \number\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.1}Subsection1.1}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1169,11 +1161,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 {subsubsection}{\protect \num\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {1.1.1}SubSubsection1.1.1}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1210,11 +1198,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 {subsubsection}{\protect \num\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {1.1.2}SubSubsection1.1.2}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1244,11 +1228,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 {subsection}{\protect \number\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.2}Subsection1.2}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1271,11 +1251,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}Section2}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 11.88335 plus 1.03331
@@ -1305,11 +1281,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 {subsection}{\protect \number\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {2.1}Subsection2.1}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1339,11 +1311,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 {subsection}{\protect \number\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {2.2}Subsection2.2}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1380,11 +1348,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 {subsubsection}{\protect \num\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {2.2.1}SubSubsection2.2.1}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1421,11 +1385,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 {subsubsection}{\protect \num\ETC.}
-=======
...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {2.2.2}SubSubsection2.2.2}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 7.75 plus 1.03331
@@ -1448,11 +1408,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 {3}Section3}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 11.88335 plus 1.03331
diff --git a/base/testfiles/tlb0574.tlg b/base/testfiles/tlb0574.tlg
index 014afaee..5e09434c 100644
--- a/base/testfiles/tlb0574.tlg
+++ b/base/testfiles/tlb0574.tlg
@@ -166,11 +166,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}OT1 \"{\i } \"\i \"{} \"{i} \"i}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90276 plus 0.86108
...\glue(\parskip) 0.0 plus 1.0
@@ -195,11 +191,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 {2}T1 \"{\i } \"\i \"{} \"{i} \"i}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\penalty 10000
...\glue 9.90036 plus 0.86089
diff --git a/base/testfiles/vlatex03-2015.luatex.tlg b/base/testfiles/vlatex03-2015.luatex.tlg
index 06f62c99..318e594e 100644
--- a/base/testfiles/vlatex03-2015.luatex.tlg
+++ b/base/testfiles/vlatex03-2015.luatex.tlg
@@ -219,11 +219,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}First}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90276 plus 0.86108
...\glue(\parskip) 0.0 plus 1.0
@@ -470,11 +466,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces First wide figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 25.7638fil, direction TLT
@@ -640,11 +632,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces Narrow figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 31.81935fil, direction TLT
@@ -807,11 +795,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces Second wide figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 21.01378fil, direction TLT
@@ -1023,11 +1007,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {4}{\ignorespaces Second narrow figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 15.8471fil, direction TLT
diff --git a/base/testfiles/vlatex03-2015.tlg b/base/testfiles/vlatex03-2015.tlg
index 92f8b596..a663ea3e 100644
--- a/base/testfiles/vlatex03-2015.tlg
+++ b/base/testfiles/vlatex03-2015.tlg
@@ -181,11 +181,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}First}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
...\penalty 10000
...\glue 9.90276 plus 0.86108
...\glue(\parskip) 0.0 plus 1.0
@@ -408,11 +404,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces First wide figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 25.7638fil
@@ -558,11 +550,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces Narrow figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 31.81935fil
@@ -709,11 +697,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces Second wide figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 21.01378fil
@@ -900,11 +884,7 @@ Completed box being shipped out [2]
.........\glue(\rightskip) 0.0 plus 1.0fil
........\penalty -51
........\glue 10.0 plus 3.0 minus 5.0
-<<<<<<< HEAD
-........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline\ETC.}
-=======
........\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {4}{\ignorespaces Second narrow figure}}{\thepage }{}\protected at file@percent }}
->>>>>>> develop
........\glue 10.0
........\glue(\baselineskip) 1.65556
........\hbox(6.94444+1.94444)x167.5, glue set 15.8471fil
More information about the latex3-commits
mailing list.