Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix rebase
Browse files Browse the repository at this point in the history
andig committed Sep 21, 2022
1 parent 6911636 commit 7af605e
Showing 6 changed files with 82 additions and 207 deletions.

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions dist/assets/index.9f475f7d.css

This file was deleted.

79 changes: 79 additions & 0 deletions dist/assets/index.bc6fd987.js

Large diffs are not rendered by default.

79 changes: 0 additions & 79 deletions dist/assets/index.f98d4e2a.js

This file was deleted.

97 changes: 0 additions & 97 deletions dist/assets/index.fd078ce0.js

This file was deleted.

18 changes: 2 additions & 16 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -20,22 +20,8 @@
<meta name="theme-color" content="#020318" />

<title>evcc</title>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<script type="module" crossorigin src="./assets/index.fd078ce0.js"></script>
<link rel="stylesheet" href="./assets/index.9f475f7d.css">
=======
<script type="module" crossorigin src="./assets/index.67263a3f.js"></script>
=======
<script type="module" crossorigin src="./assets/index.5edf95c3.js"></script>
>>>>>>> 8ac3d056c (fix fatal undefined error)
<link rel="stylesheet" href="./assets/index.9dca4fd5.css">
>>>>>>> 5ab60ba89 (Expose to ui)
=======
<script type="module" crossorigin src="./assets/index.f98d4e2a.js"></script>
<link rel="stylesheet" href="./assets/index.8e50de30.css">
>>>>>>> 487178317 (prettier startup error page; restart button; remove health check polling)
<script type="module" crossorigin src="./assets/index.bc6fd987.js"></script>
<link rel="stylesheet" href="./assets/index.5cd03bdf.css">
</head>

<body>

0 comments on commit 7af605e

Please sign in to comment.