[groff] 01/01: [mom]: BUGS recommit; removes conflict markers.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b462657d4aa63a111d34ce5a08315c8214b5be2f
Author: Peter Schaffter <peter@schaffter.ca>
AuthorDate: Wed Aug 3 18:42:12 2022 -0400

    [mom]: BUGS recommit; removes conflict markers.
---
 contrib/mom/BUGS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index deee8368c..e18d1af28 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,12 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =============
-<<<<<<< Updated upstream
 Registers #FROM_COVERTITLE and #FROM_DOC_COVERTITLE not being
 cleared in macro COLLATE.
 ---Fixed---
-=======
->>>>>>> Stashed changes
 
 DROPCAP not calculating distance to FOOTER trap correctly.
 ---Fixed---