com php-src: - damned conflicts: UPGRADING
| From: | Pierre Joye | Date: | Mon, 04 Mar 2013 11:11:20 +0000 |
| Subject: | com php-src: - damned conflicts: UPGRADING | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71397@lists.php.net to get a copy of this message | ||
Commit: 33a8e387f58ba955e78e79c4b865dd989213443e
Author: Pierre Joye <pierre.php@gmail.com> Mon, 4 Mar 2013 12:11:20 +0100
Parents: a29ae8c8f76f6c96bad2cff1007bc037d0307dd3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33a8e387f58ba955e78e79c4b865dd989213443e
Log:
- damned conflicts
Changed paths:
M UPGRADING
Diff:
diff --git a/UPGRADING b/UPGRADING
index 89107ab..09218cc 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
========================================