diff options
Diffstat (limited to 'php/configuration.php')
| -rw-r--r-- | php/configuration.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/php/configuration.php b/php/configuration.php index a8a7a29..425dd10 100644 --- a/php/configuration.php +++ b/php/configuration.php @@ -3,21 +3,25 @@ $domain_name="localhost"; +<<<<<<< HEAD +======= if (file_exists("/home/alex")) { $database_name="alex"; $database_username="alex"; $database_password="lol"; $database_location="127.0.0.1"; +>>>>>>> f1cd0085cd8dba8b25818fc998d315b28e6c13a5 $storage_root = "/home/alex/fileup_storage"; } else { - $database_name="adam"; - $database_username="adam"; - $database_password="asdfd"; - $database_location="127.0.0.1"; - $storage_root = "/home/adam/fileup_storage"; +$database_name="fileup_testing"; +$database_username="outsider"; +$database_password="parola123"; +$database_location="localhost"; + + $storage_root = "/tmp/fileup_storage"; } |