Skip to content
Snippets Groups Projects
Commit 95f55246 authored by Planoetscher Daniel (Student Com20)'s avatar Planoetscher Daniel (Student Com20)
Browse files

merge error fix

parent 2ee12a49
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,7 @@ export default function Home() {
<div className="inner">
</div>
</div>
</div>
<div className="content-container">
<div className="text-container">
<h1>ryoko</h1>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment