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/response.php
+++ b/laravel/response.php
@@ -106,7 +106,7 @@ class Response {
 	 *		return Response::eloquent($data, 200, array('header' => 'value'));
 	 * </code>
 	 *
-	 * @param  Eloquenet|array  $data
+	 * @param  Eloquent|array   $data
 	 * @param  int              $status
 	 * @param  array            $headers
 	 * @return Response