[latex3-commits] [latex3/latex2e] develop: oops committed wrong version (c991a8ea)

[github at latex-project.org]

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

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

commit c991a8eaa3fadb4c2bb37b5738a1107d9bd5db40
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Jan 29 23:36:02 2024 +0100

    oops committed wrong version


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

c991a8eaa3fadb4c2bb37b5738a1107d9bd5db40
 required/tools/multicol.dtx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index f63d729f..9c680ab5 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -99,14 +99,10 @@
 %<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
+          [2024/01/29 v1.9g  multicolumn formatting (FMi)]
+%
 %
 %
-%%
 %
 % \changes{v1.9c}{2021/11/30}{Added rollback to v1.8}
 % \changes{v1.5n}{1997/06/05}{Applied improvement of documentation,