fixing merge issues for comment tweaks

2012-07-31 16:55:02 +01:00
parent 2611c1f27a 8a34aa5077
commit 30175c2a52
21 changed files with 65 additions and 74 deletions
--- a/laravel/ioc.php
+++ b/laravel/ioc.php
@@ -179,7 +179,7 @@ class IoC {
 	/**
 	 * Resolve all of the dependencies from the ReflectionParameters.
 	 *
-	 * @param  array  $parameterrs
+	 * @param  array  $parameters
 	 * @return array
 	 */
 	protected static function dependencies($parameters)