- damned conflicts

diff --git a/UPGRADING b/UPGRADING
index 89107abbb107a73597969a963d638adc2f33c2d1..09218cca5fce68bbdd2da2b4010b00efd6b933a8 100755 (executable)
--- 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
 ========================================