From ce1a58414aa7177e71a4279cfc650610a3ec64b6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 5 Jun 2009 06:19:29 +0000 Subject: remove conflict markers --- RELEASE-NOTES | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'RELEASE-NOTES') diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 9866e5d92..af885c896 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,11 +20,8 @@ This release includes the following bugfixes: o libcurl-NSS build fixes o libcurl-NSS build fix o configure script fixed for VMS -<<<<<<< RELEASE-NOTES o set Content-Length: with POST and PUT failed with NTLM auth -======= o allow building libcurl for VxWorks ->>>>>>> 1.1030 This release includes the following known bugs: @@ -33,13 +30,8 @@ This release includes the following known bugs: This release would not have looked like this without help, code, reports and advice from friends like these: -<<<<<<< RELEASE-NOTES Yang Tse, Daniel Fandrich, Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet, Mike Crowe, Claes Jakobsson, John E. Malmberg, - Aaron Oneal -======= - Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet, - Mike Crowe, Claes Jakobsson, John E. Malmberg, Igor Novoseltsev ->>>>>>> 1.1030 + Aaron Oneal, Igor Novoseltsev Thanks! (and sorry if I forgot to mention someone) -- cgit v1.2.3