grrr, removed the conflict markers

diff --git a/docs/curl.1 b/docs/curl.1
index d6f85c10de5b3984d3f1863161b15bc8c4fac620..c09d392ea5384344f0a91f5ceb5e2a2cb762bfd7 100644 (file)
--- 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.