From 8a85da4a61c53f012174633ea7cef38cac6cfcbe Mon Sep 17 00:00:00 2001
From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 26 Mar 2013 17:46:29 +0100
Subject: [PATCH] merging conflict left over

---
 ext/gd/libgd/gd_interpolation.c | 1 -
 1 file changed, 1 deletion(-)

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