Fixing some merge issues and bumping version

2020-06-16 10:07:58 +02:00
parent f1d475580c
commit 8a2abcc543
2 changed files with 1 additions and 9 deletions
--- a/views/admin.html
+++ b/views/admin.html
@ -7,19 +7,11 @@
      <title>Admin Interface</title>
      <link
         rel="stylesheet"
-<<<<<<< HEAD
         href="https://unpkg.com/@hibas123/theme@1/out/base.css"
      />
      <link
         rel="stylesheet"
         href="https://unpkg.com/@hibas123/theme@1/out/light.css"
-=======
-         href="https://unpkg.com/@hibas123/theme/out/base.css"
-      />
-      <link
-         rel="stylesheet"
-         href="https://unpkg.com/@hibas123/theme/out/light.css"
->>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
      />

      <script src="https://unpkg.com/handlebars/dist/handlebars.min.js"></script>