From 7762a88b76f92414c244475809e00f6e22d41e6c Mon Sep 17 00:00:00 2001
From: Tomasz Komoszeski <tomasz.komoszeski@gmail.com>
Date: Sun, 18 Aug 2024 13:20:22 +0200
Subject: [PATCH] Add new certification and fix blog manager

---
 _data/en/cv.yml           | 5 ++++-
 _data/pl/cv.yml           | 3 +++
 _projects/blog-manager.md | 7 +------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/_data/en/cv.yml b/_data/en/cv.yml
index 631a091c..9f969bb8 100644
--- a/_data/en/cv.yml
+++ b/_data/en/cv.yml
@@ -153,9 +153,12 @@
         - Knowledge of computer graphics and rendering techniques
         - Network programming in multiplayer games
 
-- title: Certificates and Training
+- title: Certificates and Trainings
   type: time_table
   contents:
+    - year: 2024
+      items:
+        - Shopware 6 <a href="https://www.shopware.com/en/academy/certifications/">Certified Advanced Developer</a>
     - year: 2023
       items:
         - Internet Advertising Training, <a href="https://inspire-consulting.pl/pl">Inspire Consulting</a>
diff --git a/_data/pl/cv.yml b/_data/pl/cv.yml
index aed6e8f6..24fa8055 100644
--- a/_data/pl/cv.yml
+++ b/_data/pl/cv.yml
@@ -157,6 +157,9 @@
 - title: Certyfikaty i szkolenia
   type: time_table
   contents:
+    - year: 2024
+      items:
+        - Shopware 6 <a href="https://www.shopware.com/en/academy/certifications/">Zaawansowany programista Shopware</a>
     - year: 2023
       items:
         - Szkolenie z reklamy w internecie, <a href="https://inspire-consulting.pl/pl">Inspire Consulting</a>
diff --git a/_projects/blog-manager.md b/_projects/blog-manager.md
index fdc5179b..8d2cc22e 100644
--- a/_projects/blog-manager.md
+++ b/_projects/blog-manager.md
@@ -3,13 +3,8 @@ layout: page
 title: projects.titles.project13
 description: projects.descriptions.project13
 img: assets/img/projects/posts_manager.jpg
-<<<<<<< HEAD
-redirect: https://github.com/Ziumper/Demo-Blog-Manager
-importance: 2
-=======
 importance: 1
->>>>>>> 5edd8becad6fbff57c9f10369401844bd50e2abf
 category: web-development
 ---
-
+ 
 {% translate_file _projects/blog-manager.md %}