school/cs2440
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflicts.

Browse Source
This commit is contained in:
Joshua Ashton
2025-02-07 18:16:23 -07:00
parent 4a19469c98 5a3dc5a618
commit a574d0ddb6
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db-test/index.php
-7
View File
@@ -7,7 +7,6 @@ $db_pass = $_ENV['DATABASE_PASSWORD'];
$ip_addr = $_ENV['IP_ADDRESS']; $ip_addr = $_ENV['IP_ADDRESS'];
// Make some constants // Make some constants
<<<<<<< HEAD:db-test/index.php
if ($_SERVER['HTTP_HOST'] == 'localhost') { if ($_SERVER['HTTP_HOST'] == 'localhost') {
define('HOST', 'localhost'); define('HOST', 'localhost');
define('USER', 'root'); define('USER', 'root');
@@ -19,12 +18,6 @@ if ($_SERVER['HTTP_HOST'] == 'localhost') {
define('PASS', $db_pass); define('PASS', $db_pass);
define('DB', 'palindromes'); define('DB', 'palindromes');
} }
=======
define('HOST', '173.255.248.228');
define('USER', 'root');
define('PASS', $db_pass);
define('DB', 'palindromes');
>>>>>>> b805261 (localhost and server configuration are the same.):db-start/index.php
// Connect to the DB // Connect to the DB
$conn = mysqli_connect(HOST, USER, PASS, DB); $conn = mysqli_connect(HOST, USER, PASS, DB);