| Chunk |
|---|
| Conflicting content |
|---|
public class RealmResultsTest extends AndroidTestCase {
<<<<<<< HEAD
protected final static int TEST_DATA_SIZE = 2516;
=======
protected final static int TEST_DATA_SIZE = 516;
>>>>>>> db8703aa92dc7081a76e299dfbf5289748e3887e
protected final static int TEST_DATA_FIRST_HALF = 2*(TEST_DATA_SIZE/4)-1;
protected final static int TEST_DATA_LAST_HALF = 2*(TEST_DATA_SIZE/4)+1;
|
| Solution content |
|---|
public class RealmResultsTest extends AndroidTestCase {
protected final static int TEST_DATA_SIZE = 2516;
protected final static int TEST_DATA_FIRST_HALF = 2*(TEST_DATA_SIZE/4)-1;
protected final static int TEST_DATA_LAST_HALF = 2*(TEST_DATA_SIZE/4)+1;
|
| File |
|---|
| RealmResultsTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |