fix conflicts.

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

laravel/core.php

@@ -219,7 +219,7 @@ if (defined('STDIN'))
 |
 | Finally we will register all of the bundles that have been defined for
 | the application. None of them will be started, yet but will be setup
-| so that they may be started by the develop at any time.
+| so that they may be started by the developer at any time.
 |
 */
 

laravel/laravel.php

@@ -159,4 +159,4 @@ $response->send();
 |
 */
 
-Event::fire('laravel.done', array($response));
+Event::fire('laravel.done', array($response));

laravel/routing/controller.php

@@ -312,7 +312,7 @@ abstract class Controller {
 
 		$response = call_user_func_array(array($this, $action), $parameters);
 
-		// If the controller has specified a layout view. The response
+		// If the controller has specified a layout view the response
 		// returned by the controller method will be bound to that
 		// view and the layout will be considered the response.
 		if (is_null($response) and ! is_null($this->layout))

laravel/routing/router.php

@@ -161,7 +161,7 @@ class Router {
 	 *
 	 * <code>
 	 *		// Register a route with the router
-	 *		Router::register('GET' ,'/', function() {return 'Home!';});
+	 *		Router::register('GET', '/', function() {return 'Home!';});
 	 *
 	 *		// Register a route that handles multiple URIs with the router
 	 *		Router::register(array('GET', '/', 'GET /home'), function() {return 'Home!';});
@@ -542,7 +542,7 @@ class Router {
 			$fallback = array_get(static::$fallback, $method, array());
 
 			// When building the array of routes, we'll merge in all of the fallback
-			// routes for each request methdo individually. This allows us to avoid
+			// routes for each request method individually. This allows us to avoid
 			// collisions when merging the arrays together.
 			$routes[$method] = array_merge($routes[$method], $fallback);
 		}

laravel/url.php

@@ -40,7 +40,7 @@ class URL {
 		$route = Router::find('home');
 
 		// If a route named "home" exists, we'll route to that instead of using
-		// the single slash root URI. THis allows the HTTPS attribute to be
+		// the single slash root URI. This allows the HTTPS attribute to be
 		// respected instead of being hard-coded in the redirect.
 		if ( ! is_null($route))
 		{