tuxmain/bevyjam
tuxmain/bevyjam
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove conflict text in index.html

Browse source
This commit is contained in:
Nixon 2022-08-29 14:19:02 +08:00
parent b45f052e5a
commit 53970ee1b3
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -54,13 +54,8 @@ a, a:visited {
</head> </head>
<body> <body>
<script type="module"> <script type="module">
<<<<<<< HEAD
import init from './target/bevyjam.js'
init()
=======
import init from './target/lux-synthese.js' import init from './target/lux-synthese.js'
init() init()
>>>>>>> 0ee61d808ef10de7f38fe9755931893b647e0ab2
</script> </script>
<div id="readme"> <div id="readme">
<h1>Lux synthesĕ</h1> <h1>Lux synthesĕ</h1>