fix conflicts.

This commit is contained in:
Taylor Otwell
2012-04-10 10:10:31 -05:00
9 changed files with 30 additions and 14 deletions

View File

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