From 38b3621d389a6469341370f079b387b3a658ac84 Mon Sep 17 00:00:00 2001
From: Dev-JamesR <admin@ether1.org>
Date: Sun, 20 Oct 2019 21:13:26 -0700
Subject: [PATCH] Upstream

---
 assets/templates/uploads.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/templates/uploads.html b/assets/templates/uploads.html
index 74b85fc..e058d5b 100644
--- a/assets/templates/uploads.html
+++ b/assets/templates/uploads.html
@@ -10,7 +10,6 @@
     href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
   <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
->>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
   <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
   <script src="https://medium-widget.pixelpoint.io/widget.js"></script>
 </head>