aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-10-26 08:54:23 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-10-26 08:54:23 +0000
commit6a37135f4d56e89a85db50a38b800fd49eeafe3a (patch)
treed5f3fb4587842a4bcaab84657c564126ae391921
parentb8e1e633797f4115174b0988bc0fc1543a4cc6c8 (diff)
grrr, removed the conflict markers
-rw-r--r--docs/curl.17
1 files changed, 1 insertions, 6 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index d6f85c10d..c09d392ea 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -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.