| Chunk |
|---|
| Conflicting content |
|---|
/**
* The kind of data that is used as the display name for the contact, see
<<<<<<< HEAD
* DisplayNameSources.
=======
* {@link DisplayNameSources}.
>>>>>>> c95b39d352924ed3528e82e689973ca52228ac1a
*/
public static final String DISPLAY_NAME_SOURCE = "display_name_source";
|
| Solution content |
|---|
/**
* The kind of data that is used as the display name for the contact, see
* DisplayNameSources.
*/
public static final String DISPLAY_NAME_SOURCE = "display_name_source";
|
| File |
|---|
| ContactsContract.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
*/
/**
* The type of alphabet used to capture the phonetic name. See
<<<<<<< HEAD
* PhoneticNameStyle.
=======
* {@link PhoneticNameStyle}.
>>>>>>> c95b39d352924ed3528e82e689973ca52228ac1a
public static final String PHONETIC_NAME_STYLE = "phonetic_name_style";
|
| Solution content |
|---|
/**
* The type of alphabet used to capture the phonetic name. See
* PhoneticNameStyle.
*/
public static final String PHONETIC_NAME_STYLE = "phonetic_name_style";
|
| File |
|---|
| ContactsContract.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public static final String PHONETIC_NAME_STYLE = "phonetic_name_style";
/**
<<<<<<< HEAD
* Pronunciation of the full name. See PhoneticNameStyle.
=======
* Pronunciation of the full name. See {@link PhoneticNameStyle}.
>>>>>>> c95b39d352924ed3528e82e689973ca52228ac1a
*/
public static final String PHONETIC_NAME = "phonetic_name";
|
| Solution content |
|---|
public static final String PHONETIC_NAME_STYLE = "phonetic_name_style";
/**
* Pronunciation of the full name. See PhoneticNameStyle.
*/
public static final String PHONETIC_NAME = "phonetic_name";
|
| File |
|---|
| ContactsContract.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |