From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 26 Mar 2013 16:46:29 +0000 (+0100)
Subject: merging conflict left over
X-Git-Tag: php-5.6.0alpha1~448^2~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a85da4a61c53f012174633ea7cef38cac6cfcbe;p=php

merging conflict left over
---

diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 4de95318c8..47ba5e336e 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -2213,7 +2213,6 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
 			break;
 
 		default:
-			gdImageRotateGeneric(src, angle, bgcolor);
 			return gdImageRotateGeneric(src, angle, bgcolor);
 	}
 	return NULL;