Projects >> nfctools >>fffd5949aeb52ad453125aa10e8fb716e3efe579

Chunk
Conflicting content
/**
 * 
 * 
<<<<<<< HEAD
 * The record references are established using the URI-based Payload Identification mechanism described in the NDEF specification [NDEF]. 
 * The URI reference values SHALL be encoded as relative URIs with the virtual base defined as "urn:nfc:handover:".
 * The message generator is responsible for the uniqueness of the payload identifiers encoded into the ID field of the NDEF record header. 
 * While identifiers can be strings of length up to 255 characters, it is RECOMMENDED that short, possibly single character, strings are used. 
 * However, the generator SHALL NOT use the tilde character ("~", hexadecimal 7E) at the first string position and a 
 * compliant parser SHALL ignore strings starting with a tilde character.
=======
 * The record references are established using the URI-based Payload Identification mechanism described in the NDEF
 * specification [NDEF]. The URI reference values SHALL be encoded as relative URIs with the virtual base defined as
 * �urn:nfc:handover:�. The message generator is responsible for the uniqueness of the payload identifiers encoded into
 * the ID field of the NDEF record header. While identifiers can be strings of length up to 255 characters, it is
 * RECOMMENDED that short, possibly single character, strings are used. However, the generator SHALL NOT use the tilde
 * character (�~�, hexadecimal 7E) at the first string position and a compliant parser SHALL ignore strings starting
 * with a tilde character.
>>>>>>> 1f39427947cda88449b316bd49316551762c789b
 * 
 * @author Thomas Rorvik Skjolberg (skjolber@gmail.com)
 * 
Solution content
/**
 * 
 * 
 * The record references are established using the URI-based Payload Identification mechanism described in the NDEF
 * specification [NDEF]. The URI reference values SHALL be encoded as relative URIs with the virtual base defined as
 * "urn:nfc:handover:". The message generator is responsible for the uniqueness of the payload identifiers encoded into
 * the ID field of the NDEF record header. While identifiers can be strings of length up to 255 characters, it is
 * RECOMMENDED that short, possibly single character, strings are used. However, the generator SHALL NOT use the tilde
 * character ("~", hexadecimal 7E) at the first string position and a compliant parser SHALL ignore strings starting
 * with a tilde character.
 * 
 * @author Thomas Rorvik Skjolberg (skjolber@gmail.com)
 * 
File
AlternativeCarrierRecord.java
Developer's decision
Manual
Kind of conflict
Comment