fix conflicts.

2012-04-05 09:33:50 -05:00
parent ee288a7709 b7ac1b75af
commit 8a687053a8
5 changed files with 48 additions and 15 deletions
@@ -3,7 +3,7 @@
 * Laravel - A PHP Framework For Web Artisans
 *
 * @package  Laravel
- * @version  3.1.5
+ * @version  3.1.6
 * @author   Taylor Otwell <[email protected]>
 * @link     http://laravel.com
 */