Merge branch '1.3-bake' of dev@code.cakephp.org:cakephp into 1.3-bake

Conflicts: cake/console/libs/tasks/view.php
cakephp · Jul 28, 2009 · 84e0e10 · 84e0e10
2 parents 5a5a4d8 + 092f58b
commit 84e0e10
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
@@ -462,5 +462,4 @@ function __associations($model) {
 		return $associations;
 	}
 }
-
 ?>