Commit 6a37135f authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

grrr, removed the conflict markers

parent b8e1e633
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -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.