--- embedaddon/php/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt	2012/05/29 12:34:36	1.1
+++ embedaddon/php/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt	2013/10/14 08:02:50	1.1.1.2
@@ -1,5 +1,5 @@
 --TEST--
-Overridding Conflicting Methods should not result in a notice/warning about collisions
+Overriding Conflicting Methods should not result in a notice/warning about collisions
 --FILE--
 <?php
 error_reporting(E_ALL);