fix conflicts.

This commit is contained in:
Taylor Otwell
2012-04-05 09:33:50 -05:00
5 changed files with 48 additions and 15 deletions

View File

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