From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 4 Mar 2013 11:11:20 +0000 (+0100)
Subject: - damned conflicts
X-Git-Tag: php-5.6.0alpha1~498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33a8e387f58ba955e78e79c4b865dd989213443e;p=php

- damned conflicts
---

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
 ========================================