upload files

Ziumper · Mar 4, 2024 · 99f67fa · 99f67fa
1 parent b6f5870
commit 99f67fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/_i18n/en.yml b/_i18n/en.yml
@@ -100,11 +100,8 @@ projects:
     project13: Blog Manager
     project14: Web Cloud System
     project15: Todo App
-<<<<<<< HEAD
-    project16: File Upload
-=======
     project16: Crafter
->>>>>>> 5edd8becad6fbff57c9f10369401844bd50e2abf
+    project17: File Upload
   descriptions:
     project1: Augmented reality turn based board game for the Android platform
     project2: Monte carlo simulation app written in C++
@@ -121,11 +118,8 @@ projects:
     project13: Blog management application MVC in .net core and angular with docker-compose setup for better development experience
     project14: Easy and simple MVC .NET app to store and manage filles in .net core and angular
     project15: WPF TodoApp apllicaiton for checking AvaloniaUI framework. Project based on AvaloniaUI example with modifications and integrated Unit tests
-<<<<<<< HEAD
-    project16: File upload symfony app written in symfony 7 with usage of doctrine and PhpUnit tests
-=======
     project16: Project of a game in which a basic item crafting system has been implemented in Unity
->>>>>>> 5edd8becad6fbff57c9f10369401844bd50e2abf
+    project17: File upload symfony app written in symfony 7 with usage of doctrine and PhpUnit tests
   categories:
     fun: fun
     work: work

diff --git a/_i18n/pl.yml b/_i18n/pl.yml
@@ -102,11 +102,8 @@ projects:
     project13: Blog Manager
     project14: Web Cloud System
     project15: Todo App
-<<<<<<< HEAD
-    project16: File Upload
-=======
     project16: Crafter
->>>>>>> 5edd8becad6fbff57c9f10369401844bd50e2abf
+    project17: File Upload
   descriptions:
     project1: Gra w rozszerzonej rzeczywistości na platformę Android
     project2: Aplikacja wykonująca symulacje Monte Carlo napisana w C++
@@ -123,11 +120,8 @@ projects:
     project13: Aplikacja do zarządzania blogami MVC na platformie .NET Core i Angular z konfiguracją docker-compose dla lepszego doświadczenia programistycznego
     project14: Aplikacja webowa do trzymania i zarządzania plikami. Napisana w .NET Core
     project15: Prosta aplikacja ToDo, do zarzadzania wykonywanymi zadaniami napisania w .NET Core przy pomocy AvaloniaUI i WPF oraz testami jednostkowymi
-<<<<<<< HEAD
-    project16: Aplikacja w symfony 7, doctrine i PhpUnit do wrzucania plików na serwer z walidowanym formularzem
-=======
     project16: Projekt gry, w której został zaimplementowany podstawowy system tworzenia przedmiotów w Unity
->>>>>>> 5edd8becad6fbff57c9f10369401844bd50e2abf
+    project17: Aplikacja w symfony 7, doctrine i PhpUnit do wrzucania plików na serwer z walidowanym formularzem
   categories:
     fun: zabawa
     work: praca

diff --git a/_projects/file-upload.md b/_projects/file-upload.md
@@ -1,7 +1,7 @@
 ---
 layout: page
-title: projects.titles.project16
-description: projects.descriptions.project16
+title: projects.titles.project17
+description: projects.descriptions.project17
 img: assets/img/projects/file-upload1.png
 importance: 1
 category:  web-development