fix conflicts.

2012-04-10 10:10:31 -05:00
parent 8a687053a8 bcca8be072
commit 1a5d4250d1
9 changed files with 30 additions and 14 deletions
--- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
+++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
@@ -21,7 +21,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 	protected $other;

 	/**
-	 * The columns on the joining tbale that should be fetched.
+	 * The columns on the joining table that should be fetched.
 	 *
 	 * @var array
 	 */