remove conflict text in index.html
This commit is contained in:
parent
b45f052e5a
commit
53970ee1b3
1 changed files with 0 additions and 5 deletions
|
@ -54,13 +54,8 @@ a, a:visited {
|
|||
</head>
|
||||
<body>
|
||||
<script type="module">
|
||||
<<<<<<< HEAD
|
||||
import init from './target/bevyjam.js'
|
||||
init()
|
||||
=======
|
||||
import init from './target/lux-synthese.js'
|
||||
init()
|
||||
>>>>>>> 0ee61d808ef10de7f38fe9755931893b647e0ab2
|
||||
</script>
|
||||
<div id="readme">
|
||||
<h1>Lux synthesĕ</h1>
|
||||
|
|
Loading…
Reference in a new issue