ClaytonWWilson/FightHub
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/FightHub.git synced 2025-12-16 07:28:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed upload.php merge conflict

Browse Source
This commit is contained in:
Ubuntu 2019-04-20 16:51:49 -04:00
parent dfaf9a1fe9
commit 9b4d874b62
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
upload.php
View File

@ -1,39 +1,3 @@
<<<<<<< HEAD
<html>
<head>
<title>FightHub - Upload</title>
<link rel="stylesheet" href="main.css">
<script src="scripts/main.js"></script>
</head>
<body>
<?php
$servername = "localhost";
$username = "fighthubuser";
$password = "cC33dC8W";
$conn = new mysqli($servername, $username, $password);
if($conn->connect_error) {
die("Connection failed: " . $conn->connect_error);
}
$url = $_GET['url'];
$name = $_GET['name'];
$username = $_GET['username'];
$description = $_GET['description'];
$event_date = $_GET['date'];
$length = $_GET['length'];
$characters = $_GET['characters'];
$players = $_GET['players'];
$game = $_GET['game'];
$stage = $_GET['stage'];
echo "<h1>" . $game . "</h1>";
?>
</body>
</html>
=======
<html> <html>
<head> <head>
<title>FightHub - Upload</title> <title>FightHub - Upload</title>
@ -97,4 +61,3 @@
</body> </body>
</html> </html>
>>>>>>> master