com php-src: trivial change try to ci a "fake" merge: tests/classes/ctor_in_interface_02.phpt
| From: | Xinchen Hui | Date: | Fri, 30 Mar 2012 12:50:45 +0000 |
| Subject: | com php-src: trivial change try to ci a "fake" merge: tests/classes/ctor_in_interface_02.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68614@lists.php.net to get a copy of this message | ||
Commit: 14fdb8bf0a0706385c2ac1ae285398908001a3fc
Author: Xinchen Hui <laruence@gmail.com> Fri, 30 Mar 2012 20:50:45 +0800
Parents: e2edc820e0fec05e3111bdbfd4458fd20d748dfa
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=14fdb8bf0a0706385c2ac1ae285398908001a3fc
Log:
trivial change try to ci a "fake" merge
seems now a empty merge will not be accepted by pre-receive-hook
"remote: We cannot figure out what you comitted!"
Changed paths:
M tests/classes/ctor_in_interface_02.phpt
Diff:
14fdb8bf0a0706385c2ac1ae285398908001a3fc
diff --git a/tests/classes/ctor_in_interface_02..phpt b/tests/classes/ctor_in_interface_02.phpt
index 0c7931e..08e6f36 100755
--- a/tests/classes/ctor_in_interface_02.phpt
+++ b/tests/classes/ctor_in_interface_02.phpt
@@ -29,7 +29,6 @@ class implem13 implements constr1, constr3
{
}
}
-
?>
--EXPECTF--
Fatal error: Declaration of implem13::__construct() must be compatible with
constr3::__construct($a) in %s on line %d