| Chunk |
|---|
| Conflicting content |
|---|
import org.json.JSONObject; <<<<<<< HEAD ======= import android.util.Log; >>>>>>> 5169d7958062c7acca944308fb4121522a4a1e89 import edu.stanford.mobisocial.dungbeetle.feed.iface.Activator; import edu.stanford.mobisocial.dungbeetle.feed.iface.DbEntryHandler; import edu.stanford.mobisocial.dungbeetle.feed.iface.FeedRenderer; |
| Solution content |
|---|
import org.json.JSONObject; import android.util.Log; import edu.stanford.mobisocial.dungbeetle.feed.iface.Activator; import edu.stanford.mobisocial.dungbeetle.feed.iface.DbEntryHandler; import edu.stanford.mobisocial.dungbeetle.feed.iface.FeedRenderer; |
| File |
|---|
| DbObjects.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.stanford.mobisocial.dungbeetle.feed.objects.VideoObj;
import edu.stanford.mobisocial.dungbeetle.feed.objects.VoiceObj;
import edu.stanford.mobisocial.dungbeetle.model.DbObject;
<<<<<<< HEAD
=======
import edu.stanford.mobisocial.dungbeetle.model.DbRelation;
>>>>>>> 5169d7958062c7acca944308fb4121522a4a1e89
public final class DbObjects {
|
| Solution content |
|---|
import edu.stanford.mobisocial.dungbeetle.feed.objects.VideoObj;
import edu.stanford.mobisocial.dungbeetle.feed.objects.VoiceObj;
import edu.stanford.mobisocial.dungbeetle.model.DbObject;
public final class DbObjects {
|
| File |
|---|
| DbObjects.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |