From 9b4d874b62172f9c951d1e60cf02c1d326647f98 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 16:51:49 -0400 Subject: [PATCH] fixed upload.php merge conflict --- upload.php | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/upload.php b/upload.php index cc76020..7bf6d0d 100644 --- a/upload.php +++ b/upload.php @@ -1,39 +1,3 @@ -<<<<<<< HEAD - - - FightHub - Upload - - - - - - 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 "

" . $game . "

"; - ?> - - -======= FightHub - Upload @@ -97,4 +61,3 @@ ->>>>>>> master