merging conflict left over

diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 4de95318c89f2aa98c85d87a01601fd0c281ab54..47ba5e336ea74a5f1c91fbd182d695fd19317209 100644 (file)
--- 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;