fix merge conflicts.

artisan

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.2
+ * @version  3.1.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

changes.md

@@ -4,6 +4,8 @@ ## Contents
 
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
+- [Laravel 3.1.3](#3.1.3)
+- [Upgrading From 3.1.2](#uprade-3.1.3)
 - [Laravel 3.1.2](#3.1.2)
 - [Upgrading From 3.1.1](#upgrade-3.1.2)
 - [Laravel 3.1.1](#3.1.1)
@@ -11,6 +13,7 @@ ## Contents
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
+<<<<<<< HEAD
 <a name="3.2"></a>
 ## Laravel 3.2
 
@@ -26,6 +29,16 @@ ## Upgrading From 3.1
 - Replace the **laravel** folder.
 - Add new **vendors** folder.
 
+<a name="3.1.3"></a>
+## Laravel 3.1.3
+
+- Fixes **delete** method in Eloquent models.
+
+<a name="upgrade-3.1.3"></a>
+## Upgrade From 3.1.2
+
+- Replace the **laravel** folder.
+
 <a name="3.1.2"></a>
 ## Laravel 3.1.2
 

laravel/database/eloquent/model.php

@@ -385,6 +385,19 @@ public function save()
 		return $result;
 	}
 
+	/**
+	 * Delete the model from the database.
+	 *
+	 * @return int
+	 */
+	public function delete()
+	{
+		if ($this->exists)
+		{
+			return $this->query()->where(static::$key, '=', $this->get_key())->delete();
+		}
+	}
+
 	/**
 	 * Set the update and creation timestamps on the model.
 	 *

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -170,9 +170,7 @@ public function insert($attributes, $joining = array())
 	 */
 	public function delete()
 	{
-		$id = $this->base->get_key();
+		return $this->pivot()->delete();
-
-		return $this->joining_table()->where($this->foreign_key(), '=', $id)->delete();
 	}
 
 	/**

paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.2
+ * @version  3.1.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.2
+ * @version  3.1.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */