[latex3-commits] [latex3/latex2e] add-theHcount: remove stray text from merge (0454d176)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : add-theHcount
Link       : https://github.com/latex3/latex2e/commit/0454d176d73a57db2ed767aba35193cdde7b2c30

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

commit 0454d176d73a57db2ed767aba35193cdde7b2c30
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Fri Sep 20 18:22:57 2024 +0200

    remove stray text from merge


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

0454d176d73a57db2ed767aba35193cdde7b2c30
 base/changes.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base/changes.txt b/base/changes.txt
index d096fc1c..04fadda6 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -524,7 +524,6 @@ All changes above are only part of the development branch for the next release.
 	* usrguide.tex
 	Correct description of font encodings supported for case changing
 
->>>>>>> develop
 2023-06-09  Joseph Wright  <Joseph.Wright at latex-project.org>
 
 	* usrguide.tex