generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

grrr, removed the conflict markers

Browse Source
This commit is contained in:
Daniel Stenberg 2009-10-26 08:54:23 +00:00
parent b8e1e63379
commit 6a37135f4d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/curl.1
View File

@ -221,12 +221,7 @@ To create remote directories when using FTP or SFTP, try
(FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
.IP "--crlfile <file>"
(HTTPS/FTPS) Provide a file using PEM format with a Certificate Revocation
<<<<<<< curl.1
List that may specify what peer certificates that are to be considered
revoked.
=======
List that may specify peer certificates that are to be considered revoced.
>>>>>>> 1.278
List that may specify peer certificates that are to be considered revoked.
If this option is used several times, the last one will be used.