From b8e1e633797f4115174b0988bc0fc1543a4cc6c8 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 Oct 2009 08:53:07 +0000
Subject: spell fix by Michael Wood

---
 docs/curl.1 | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs')

diff --git a/docs/curl.1 b/docs/curl.1
index 51868ec83..d6f85c10d 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -221,7 +221,12 @@ 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
 
 If this option is used several times, the last one will be used.
 
-- 
cgit v1.2.3