chore: resolve local merge conflict
This commit is contained in:
commit
27fd12562e
11 files changed
+1752
-152
No files matched your search
+13
-1
@@ -13,19 +13,31 @@
|
||||
<body>
|
||||
<div class="page-wrapper">
|
||||
<header class="header">
|
||||
<<<<<<< HEAD
|
||||
<div class="header__brand">Invité</div>
|
||||
<div class="header__actions">
|
||||
<a class="nav__link" href="#">Event finden</a>
|
||||
<button class="btn btn--outline" type="button">Login</button>
|
||||
</div>
|
||||
</header>
|
||||
=======
|
||||
<div class="header__brand">LOGO</div>
|
||||
|
||||
<div class="header__actions">
|
||||
<nav class="nav">
|
||||
<a class="nav__link btn btn--outline" href="event_overview.html">Event finden</a>
|
||||
</nav>
|
||||
<a class="btn btn--outline" href="login.html">Login</a>
|
||||
</div>
|
||||
</header>
|
||||
>>>>>>> 434d0f34b927873523861ef29092aabcd3573ade
|
||||
|
||||
<main class="main-content">
|
||||
<section class="hero">
|
||||
<div class="hero__left">
|
||||
<h1 class="hero__title">Zu Tisch mit Fremden – bereit für die nächste kulinarische Begegnung?</h1>
|
||||
<p class="hero__description">Dein Ort um neue Leute kennen zu lernen! Erstelle eigene Events und lade Gäste zu dir nach Hause ein.</p>
|
||||
<button class="btn btn--primary" type="button">Anmelden</button>
|
||||
<a class="btn btn--primary" href="signup.html">Anmelden</a>
|
||||
</div>
|
||||
|
||||
<div class="hero__right">
|
||||
|
||||
Reference in new issue
Block a user