merge

geranium
2024-06-10 16:48:46 +02:00 · 2024-06-10 16:46:26 +02:00
1 changed files with 2 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -7,7 +7,6 @@
    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.0/css/bulma.min.css">
 </head>
 <body>
-<<<<<<< HEAD
    <section class="hero is-primary is-medium">
        <div class="hero-body">
          <h1 class="title">
@ -17,6 +16,8 @@
            Uczymy sie korzystać z Git-a
          </p>
          <p>A tu bedzie piękna tabela</p>
+          <p>A tu malutkie geranium ze zdjeciami</p>
+
        </div>
    </section>
 </body>
Author	SHA1	Message	Date
Joanna De Bruijn	b2b8c9d8ae	merge	2024-06-10 16:48:46 +02:00
Joanna De Bruijn	0de664defd	geranium	2024-06-10 16:46:26 +02:00