| Chunk |
|---|
| Conflicting content |
|---|
// int scale = 60;
//System.out.println(target.getLuminosity());
if (target != null
<<<<<<< HEAD
&& target.getLuminosity() > MasterState.SHADOW_THRESHOLD*8) {
=======
&& target.getLuminosity() > MasterState.SHADOW_THRESHOLD) {
>>>>>>> 802ea505ee2b6cbb55fc6164d9bfcef5722b4722
decrement(delta);
} else if (value < BAR_MAX / 2 && !isMoving(target)) { |
| Solution content |
|---|
decrement(delta);
// int scale = 60;
//System.out.println(target.getLuminosity());
if (target != null
&& target.getLuminosity() > MasterState.SHADOW_THRESHOLD*8) {
} else if (value < BAR_MAX / 2 && !isMoving(target)) { |
| File |
|---|
| MeterControl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |