From: Pierre Joye <pierre.php@gmail.com>
Date: Sun, 24 Mar 2013 15:54:55 +0000 (+0100)
Subject: fix conflict
X-Git-Tag: php-5.6.0alpha1~448^2~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94c083ba645c77faa677c2ced7e2b5e8b94c3ebc;p=php

fix conflict
---

94c083ba645c77faa677c2ced7e2b5e8b94c3ebc
diff --cc ext/gd/libgd/gd_interpolation.c
index e1c87282fd,15b5415715..77d7dd1543
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@@ -2220,7 -2207,7 +2221,8 @@@ gdImagePtr gdImageRotateInterpolated(co
  			break;
  
  		default:
 +			gdImageRotateGeneric(src, angle, bgcolor);
+ 			return gdImageRotateGeneric(src, angle, bgcolor);
  	}
  	return NULL;
  }