[latex3-commits] [latex3/latex2e] develop: Fix multicol docs. (95c88636)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/95c88636899da8173a37f077b9e0200f3acc042f

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

commit 95c88636899da8173a37f077b9e0200f3acc042f
Merge: 1eb5c96c d26b5f3f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Jan 29 23:31:49 2024 +0100

    Fix multicol docs.


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

95c88636899da8173a37f077b9e0200f3acc042f
 required/tools/multicol.dtx | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --cc required/tools/multicol.dtx
index 5fecc619,2be7b90c..f63d729f
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@@ -99,7 -99,7 +99,11 @@@
  %<driver> \ProvidesFile{multicol.drv}
  % \fi
  %         \ProvidesFile{multicol.dtx}
++<<<<<<< HEAD
 +          [2023/12/02 v1.9g  multicolumn formatting (FMi)]
++=======
+           [2023/11/08 v1.9f  multicolumn formatting (FMi)]
++>>>>>>> various-doc-fixes
  %
  %
  %%