From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 Oct 2009 08:54:23 +0000 (+0000)
Subject: grrr, removed the conflict markers
X-Git-Tag: curl-7_19_7~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a37135f4d56e89a85db50a38b800fd49eeafe3a;p=curl

grrr, removed the conflict markers
---

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.