From c70626cebe624c1ac54639138587f798a82c5859 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Sat, 20 Apr 2019 18:00:00 -0400
Subject: [PATCH] Fix Merge

---
 upload.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/upload.php b/upload.php
index 30440a8..8efc326 100644
--- a/upload.php
+++ b/upload.php
@@ -20,7 +20,6 @@
         <h3>Youtube URL *</h3>
         <input type="text" name="url" id="url">
 
-<<<<<<< HEAD
         <h3>Video Title *</h3>
         <input type="text" name="title" id="title">