Fix merge

This commit is contained in:
WillyJL
2025-10-05 22:34:04 +02:00
parent 43f08bd0ba
commit c4fcda770e

View File

@@ -154,11 +154,8 @@ Header,+,lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.h,,
Header,+,lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h,,
Header,+,lib/nfc/protocols/iso14443_4b/iso14443_4b.h,,
Header,+,lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h,,
<<<<<<< HEAD
Header,+,lib/nfc/protocols/iso15693_3/iso15693_3.h,,
Header,+,lib/nfc/protocols/iso15693_3/iso15693_3_listener.h,,
=======
>>>>>>> ofw/dev
Header,+,lib/nfc/protocols/iso15693_3/iso15693_3_poller.h,,
Header,+,lib/nfc/protocols/mf_classic/mf_classic.h,,
Header,+,lib/nfc/protocols/mf_classic/mf_classic_listener.h,,
1 entry status name type params
154 Header + lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h
155 Header + lib/nfc/protocols/iso14443_4b/iso14443_4b.h
156 Header + lib/nfc/protocols/iso14443_4b/iso14443_4b_poller.h
<<<<<<< HEAD
157 Header + lib/nfc/protocols/iso15693_3/iso15693_3.h
158 Header + lib/nfc/protocols/iso15693_3/iso15693_3_listener.h
=======
>>>>>>> ofw/dev
159 Header + lib/nfc/protocols/iso15693_3/iso15693_3_poller.h
160 Header + lib/nfc/protocols/mf_classic/mf_classic.h
161 Header + lib/nfc/protocols/mf_classic/mf_classic_listener.h