Commit 26e1bc78 authored by Jizhou Liao's avatar Jizhou Liao Committed by Martijn Coenen
Browse files

Fix conflict vendor proprietary definitions. 

Use protocol definition from .conf file in
libnfc-nci instead of fixed value.

Change-Id: Ib8a74304974de3396a2f9cc644bce3dc07421f21
parent b896d429
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment