OpenServer/RealtimeDB-OLD
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing some merge issues and bumping version
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Fabian Stamm 2020-06-16 10:07:58 +02:00
parent f1d475580c
commit 8a2abcc543
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@hibas123/realtimedb", "name": "@hibas123/realtimedb",
"version": "2.0.0-beta.19", "version": "2.0.0-beta.20",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"private": true, "private": true,

8
views/admin.html
View File

@ -7,19 +7,11 @@
<title>Admin Interface</title> <title>Admin Interface</title>
<link <link
rel="stylesheet" rel="stylesheet"
<<<<<<< HEAD
href="https://unpkg.com/@hibas123/theme@1/out/base.css" href="https://unpkg.com/@hibas123/theme@1/out/base.css"
/> />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://unpkg.com/@hibas123/theme@1/out/light.css" 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> <script src="https://unpkg.com/handlebars/dist/handlebars.min.js"></script>