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/database/query.php
+++ b/laravel/database/query.php
@@ -167,7 +167,7 @@ class Query {
 		}

 		// If the column is just a string, we can assume that the join just
-		// has a simple "ON" clause, and we'll create the join instance and
+		// has a simple on clause, and we'll create the join instance and
 		// add the clause automatically for the developer.
 		else
 		{