diff options
Diffstat (limited to 'php/configuration.php')
| -rw-r--r-- | php/configuration.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/php/configuration.php b/php/configuration.php index 425dd10..5510131 100644 --- a/php/configuration.php +++ b/php/configuration.php @@ -3,14 +3,11 @@ $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"; } |