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/url.php
+++ b/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))
 		{