1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00

merging conflict left over

This commit is contained in:
Pierre Joye
2013-03-26 17:46:29 +01:00
parent 3b48dc0848
commit 8a85da4a61

View File

@@ -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;