fixing merge issues for comment tweaks

2012-07-31 16:55:02 +01:00
parent 2611c1f27a 8a34aa5077
commit 30175c2a52
21 changed files with 65 additions and 74 deletions
--- a/laravel/cli/command.php
+++ b/laravel/cli/command.php
@@ -100,7 +100,7 @@ class Command {
 	 *		// Resolve an instance of a task
 	 *		$task = Command::resolve('application', 'migrate');
 	 *
-	 *		// Resolve an instance of a task wtihin a bundle
+	 *		// Resolve an instance of a task within a bundle
 	 *		$task = Command::resolve('bundle', 'foo');
 	 * </code>
 	 *