diff --git a/nyomkodos.txt b/nyomkodos.txt index f84f89cfd4acb651a9dbdfe9aea39d2b406320c7..bb9150345c4f175bd93fd6dea834c9cfd058d9e3 100644 --- a/nyomkodos.txt +++ b/nyomkodos.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD nyomkodas jabsdhadliu - -======= nyomkkkkkkkkkkkkkkkkkkkkkkkodas ->>>>>>> ce59b4870ffce7fea9818176d7b7a423d558922c