talons

commit b61f6cfcf637bab31aa7616d1ceadf70e05e16cb
parent 3674865761a7d909ac4bff505a624b175d842c41
Author: Paul <paul@claws-mail.org>
Date:   Fri,  6 May 2022 13:30:10 +0100

remove some stray conflict markers

Diffstat:
M
NEWS
 | 
1
-
M
doc/man/claws-mail.1
 | 
4
----

2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
@@ -112,7 +112,6 @@
 	o weird logic with the 'Edit filter action' dialog
 	o resource leaks; memory corruption
 
->>>>>>> gtk3
 * 4.0.0 / 3.18.0
 ----------------
 
diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
@@ -261,11 +261,7 @@ Claws Mail output file when \-\-debug is enabled. If
 %TEMP% is not set it defaults to windows directory (usually
 C:\\Windows) or C:\\ if windows directory is not available.
 .TP
-<<<<<<< HEAD
-\fB %APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
-=======
 \fB%APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
->>>>>>> gtk3
 Claws Mail log file.
 
 .SH "EXAMPLES"