| Chunk |
|---|
| Conflicting content |
|---|
protected static String DEFAULT_DOMAIN;
<<<<<<< HEAD
=======
private Context mContext;
>>>>>>> ebe3b2a4fe9178aeaa5845d97c10149cfe35a1ed
private AsyncQueryService mService;
// public int mModification; |
| Solution content |
|---|
protected static String DEFAULT_DOMAIN;
private AsyncQueryService mService;
// public int mModification; |
| File |
|---|
| EditEventHelper.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |