Skip to content

Commit

Permalink
Merge pull request #14 from dimitrov-d/1.0
Browse files Browse the repository at this point in the history
1.0 conflict fixes
  • Loading branch information
dimitrov-d authored Nov 28, 2023
2 parents cf6d46c + 93f3e6a commit a6a5364
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@
"preset": "ts-jest",
"verbose": true
}
}
}
Binary file removed packages/cli/test/hosting/www/Kalmia.png
Binary file not shown.
5 changes: 2 additions & 3 deletions packages/cli/test/hosting/www/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<html>

<body style="background-color:black; color: white;text-align:center">
<h1 style="margin: 100px;">Hello world!<br>👋</h1><br/>
<img src="Kalmia.png" style="margin: 100px;"/> <br/>
<img src="apillon-beta.png" style="margin: 100px;"/> <br/>
<h1 style="margin: 100px;">Hello world!<br>👋</h1><br />
<img src="apillon-beta.png" style="margin: 100px;" /> <br />
</body>

</html>

0 comments on commit a6a5364

Please sign in to comment.