Closed szemerekiviktor closed 3 years ago
Hi @szemerekiviktor How should I deal with the conflicts?
@mkubicek-dtc , please update the files on the master with the content of the branch hu-update. Two files are also deleted according to the hu-update branch. This files should be deleted also.
Hi @szemerekiviktor How should I deal with the conflicts?