fixing conflicts.

This commit is contained in:
Taylor Otwell
2012-04-24 10:42:57 -05:00
6 changed files with 31 additions and 8 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
*
* @package Laravel
* @version 3.1.8
* @version 3.1.9
* @author Taylor Otwell <[email protected]>
* @link http://laravel.com
*/