diff --git a/14/title.txt b/14/title.txt index 99b6c15..e773368 100644 --- a/14/title.txt +++ b/14/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Likpi 14 -======= -Likpi ->>>>>>> e5239d50632e26d70d9a4e9628bad3b0ea06d482 +Likpi 14 \ No newline at end of file diff --git a/16/title.txt b/16/title.txt index 5700cfd..858bff2 100644 --- a/16/title.txt +++ b/16/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Likpi 16 -======= -LIKPI 16 ->>>>>>> dc234667cb196a374004a02bdbb190f79b2d06db +Likpi 16 \ No newline at end of file