remove some stray conflict markers
This commit is contained in:
parent
3674865761
commit
b61f6cfcf6
1
NEWS
1
NEWS
|
@ -112,7 +112,6 @@
|
||||||
o weird logic with the 'Edit filter action' dialog
|
o weird logic with the 'Edit filter action' dialog
|
||||||
o resource leaks; memory corruption
|
o resource leaks; memory corruption
|
||||||
|
|
||||||
>>>>>>> gtk3
|
|
||||||
* 4.0.0 / 3.18.0
|
* 4.0.0 / 3.18.0
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
|
|
@ -261,11 +261,7 @@ Claws Mail output file when \-\-debug is enabled. If
|
||||||
%TEMP% is not set it defaults to windows directory (usually
|
%TEMP% is not set it defaults to windows directory (usually
|
||||||
C:\\Windows) or C:\\ if windows directory is not available.
|
C:\\Windows) or C:\\ if windows directory is not available.
|
||||||
.TP
|
.TP
|
||||||
<<<<<<< HEAD
|
|
||||||
\fB %APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
|
|
||||||
=======
|
|
||||||
\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.
|
Claws Mail log file.
|
||||||
|
|
||||||
.SH "EXAMPLES"
|
.SH "EXAMPLES"
|
||||||
|
|
Loading…
Reference in a new issue