| Chunk |
|---|
| Conflicting content |
|---|
import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; <<<<<<< HEAD ======= import android.widget.CompoundButton; >>>>>>> 4565612ee6c458f1ee530944ea8c25899fef2ae5 import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; |
| Solution content |
|---|
import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.CompoundButton; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; |
| File |
|---|
| WaypointDialogHelper.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
InputStream is = null;
if("default".equalsIgnoreCase(name)) {
name = DEFAULT_RENDER;
<<<<<<< HEAD
}
=======
}
>>>>>>> 4565612ee6c458f1ee530944ea8c25899fef2ae5
if(externalRenderers.containsKey(name)){
is = new FileInputStream(externalRenderers.get(name));
} else if(internalRenderers.containsKey(name)){ |
| Solution content |
|---|
InputStream is = null;
if("default".equalsIgnoreCase(name)) {
name = DEFAULT_RENDER;
}
if(externalRenderers.containsKey(name)){
is = new FileInputStream(externalRenderers.get(name));
} else if(internalRenderers.containsKey(name)){ |
| File |
|---|
| RendererRegistry.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |