| Chunk |
|---|
| Conflicting content |
|---|
import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AdapterView; <<<<<<< HEAD import android.widget.AdapterView.OnItemClickListener; ======= >>>>>>> af82111af8c66ab55e6916c3e6ef59686b889475 import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; |
| Solution content |
|---|
import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; |
| File |
|---|
| DashboardActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
private Group selectedGroup; Runnable syncThread, addGroupToServerThread, checkUserRunnable; private long lastSynced=0; <<<<<<< HEAD ======= boolean registered=false; private UserGroupDatabaseHelper helper; >>>>>>> af82111af8c66ab55e6916c3e6ef59686b889475 private UserGroupManager uGManager; private GroupListAdapter groupListAdapter; private ListView groupList; |
| Solution content |
|---|
private Group selectedGroup; Runnable syncThread, addGroupToServerThread, checkUserRunnable; private long lastSynced=0; boolean registered=false; private UserGroupDatabaseHelper helper; private UserGroupManager uGManager; private GroupListAdapter groupListAdapter; private ListView groupList; |
| File |
|---|
| DashboardActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |