diff --git a/01/title.txt b/01/title.txt index 2350e3b..dc7f730 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Sehluko 1 -======= -Sehluko ->>>>>>> 833ddf07a16bc693341ac456fd07e9fc88da8427 +Sehluko 1 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index aad183a..501d3bb 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Matewu -======= -Mathewu ->>>>>>> 833ddf07a16bc693341ac456fd07e9fc88da8427 +Matewu \ No newline at end of file