fix conflicts.

2012-04-18 20:38:36 -05:00
parent 62935964eb 9c823d42be
commit 51f5fdd0c9
6 changed files with 7 additions and 7 deletions
--- a/laravel/cli/tasks/bundle/bundler.php
+++ b/laravel/cli/tasks/bundle/bundler.php
@@ -125,7 +125,7 @@ class Bundler extends Task {

 			if ($response['status'] == 'not-found')
 			{
-				throw new \Exception("There is not a bundle named [$bundle].");
+				throw new \Exception("There is no bundle named [$bundle].");
 			}

 			// If the bundle was retrieved successfully, we will add it to