ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/config/database.php
View File

@@ -35,7 +35,7 @@ return array(
| Default Database Connection
|--------------------------------------------------------------------------
|
| The name of your default database connection. This connection will used
| The name of your default database connection. This connection will be used
| as the default for all database operations unless a different name is
| given when performing said operation. This connection name should be
| listed in the array of connections below.
@@ -54,7 +54,7 @@ return array(
| the freedom to specify as many connections as you can handle.
|
| All database work in Laravel is done through the PHP's PDO facilities,
| so make sure you have the PDO drivers for your particlar database of
| so make sure you have the PDO drivers for your particular database of
| choice installed on your machine.
|
*/