Skip to content
Browse files

- damned conflicts

  • Loading branch information...
1 parent a29ae8c commit 33a8e387f58ba955e78e79c4b865dd989213443e @pierrejoye pierrejoye committed Mar 4, 2013
Showing with 0 additions and 21 deletions.
  1. +0 −21 UPGRADING
View
21 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
========================================

0 comments on commit 33a8e38

Please sign in to comment.
Something went wrong with that request. Please try again.