From 8a2abcc543a937ba01afafbd7b11ed514e0a66cf Mon Sep 17 00:00:00 2001
From: Fabian Stamm <dev@fabianstamm.de>
Date: Tue, 16 Jun 2020 10:07:58 +0200
Subject: [PATCH] Fixing some merge issues and bumping version

---
 package.json     | 2 +-
 views/admin.html | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 332ac6c..d34a3a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@hibas123/realtimedb",
-   "version": "2.0.0-beta.19",
+   "version": "2.0.0-beta.20",
    "description": "",
    "main": "lib/index.js",
    "private": true,
diff --git a/views/admin.html b/views/admin.html
index 4544959..5d3dd56 100644
--- 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>