gfgit
/
claws-mail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some stray conflict markers

This commit is contained in:
Paul 2022-05-06 13:30:10 +01:00
parent 3674865761
commit b61f6cfcf6
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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
----------------

4
doc/man/claws-mail.1
View File

@ -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"