add conflict with previous version #1

Closed

mbussolotto wants to merge 1 commits from mbussolotto/libtcnative-2-0:main into main

pull from: mbussolotto/libtcnative-2-0:main

merge into: java-packages:main

java-packages:main

Conversation 2 Commits 1 Files Changed 1 +1

1 Commits

Author	SHA256	Message	Date
mbussolotto	95f6ddf7db	add conflict with previous version	2026-02-09 09:07:45 +01:00