From 33a8e387f58ba955e78e79c4b865dd989213443e Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 4 Mar 2013 12:11:20 +0100 Subject: [PATCH] - damned conflicts --- UPGRADING | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/UPGRADING b/UPGRADING index 89107abbb1..09218cca5f 100755 --- a/UPGRADING +++ b/UPGRADING @@ -68,28 +68,7 @@ PHP X.Y UPGRADE NOTES 9. New Global Constants ======================================== -<<<<<<< HEAD -======= -- mysqli: - - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options() -- cURL: - - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt(). - -- GD - - Added constants for imageflip: - . IMG_FLIP_HORIZONTAL - . IMG_FLIP_VERTICAL - . IMG_FLIP_BOTH - - Added constants for imagecrop - . IMG_CROP_DEFAULT - . IMG_CROP_TRANSPARENT - . IMG_CROP_BLACK - . IMG_CROP_WHITE - . IMG_CROP_SIDES - . IMG_CROP_THRESHOLD - ->>>>>>> PHP-5.5 ======================================== 10. Changes to INI File Handling ======================================== -- 2.50.1