From ac09acc53c6a33c89871accfdf6777edbae666f8 Mon Sep 17 00:00:00 2001
From: martin-nb995 <Admin@0z6sw.onmicrosoft.com>
Date: Tue, 17 Jun 2025 09:33:28 +0200
Subject: [PATCH 1/2] fix: add unique ID to the first project section in
 portfolio

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 817bb50..48f6922 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@ <h2>O mne</h2>
 
         <section id="projects">
             <h2>Moje Projekty</h2>
-            <div class="project">
+            <div class="project" id="1">
                 <h3>🐶 Môj web o psoch</h3>
                 <p>Stránka s informáciami o rôznych plemenách psov, ktorú som vytvorila pomocou HTML a CSS.</p>
                 <a href="https://example.com/dog-site" target="_blank">Zobraziť projekt</a>

From 3c222d7267e964b775129c3b481237c430b95637 Mon Sep 17 00:00:00 2001
From: Marek Kromka <marek.kromka@siemens.com>
Date: Tue, 17 Jun 2025 09:49:06 +0200
Subject: [PATCH 2/2] feat: chagne the paragraph

---
 index.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 48f6922..96bd07e 100644
--- a/index.html
+++ b/index.html
@@ -34,9 +34,7 @@ <h2>O mne</h2>
         <section id="projects">
             <h2>Moje Projekty</h2>
             <div class="project" id="1">
-                <h3>🐶 Môj web o psoch</h3>
-                <p>Stránka s informáciami o rôznych plemenách psov, ktorú som vytvorila pomocou HTML a CSS.</p>
-                <a href="https://example.com/dog-site" target="_blank">Zobraziť projekt</a>
+               <h4>MERGE CONFLICT</h4>
             </div>
 
             <div class="project">