fix conflicts.

2012-04-10 10:10:31 -05:00
parent 8a687053a8 bcca8be072
commit 1a5d4250d1
9 changed files with 30 additions and 14 deletions
--- a/laravel/cli/tasks/migrate/resolver.php
+++ b/laravel/cli/tasks/migrate/resolver.php
@@ -116,7 +116,7 @@ class Resolver {
 			// naming collisions with other bundle's migrations.
 			$prefix = Bundle::class_prefix($bundle);

-			$class = $prefix.substr($name, 18);
+			$class = $prefix.\Laravel\Str::classify(substr($name, 18));

 			$migration = new $class;