From 2516e3b2199678ef663db352dfbf328824c190a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1d=C3=A1rkuti=20Soma=20Zsolt?= <kadso@cortex.itk.ppke.hu> Date: Thu, 5 Dec 2024 11:08:42 +0100 Subject: [PATCH] file modified --- nyomkodos.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nyomkodos.txt b/nyomkodos.txt index f84f89c..bb91503 100644 --- a/nyomkodos.txt +++ b/nyomkodos.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD nyomkodas jabsdhadliu - -======= nyomkkkkkkkkkkkkkkkkkkkkkkkodas ->>>>>>> ce59b4870ffce7fea9818176d7b7a423d558922c -- GitLab