| Chunk |
|---|
| Conflicting content |
|---|
}
public void reposition() {
<<<<<<< HEAD
if (false) { // simple layout
=======
if (D.M.S.layout == Layout.SIMPLE) { // simple layout
>>>>>>> 815bbbcd422f7d26c23b9b9500ad569190f45e1c
reboxTree();
repos();
} else { // Reingold-Tilford layout |
| Solution content |
|---|
}
public void reposition() {
if (D.M.S.layout == Layout.SIMPLE) { // simple layout
reboxTree();
repos();
} else { // Reingold-Tilford layout |
| File |
|---|
| BSTNode.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
+ i);
return "";
}
<<<<<<< HEAD
}
public static VisPanel getPanel(int i, Languages L) {
=======
}
public static VisPanel getPanel(int i, Settings S) {
>>>>>>> 815bbbcd422f7d26c23b9b9500ad569190f45e1c
if (!check_range(i))
return null;
try { |
| Solution content |
|---|
+ i);
return "";
}
}
public static VisPanel getPanel(int i, Settings S) {
if (!check_range(i))
return null;
try { |
| File |
|---|
| DataStructures.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public DataStructure D; // datovej struktury public Screen screen; // obrazovky v strede public ILabel statusBar; // a status baru <<<<<<< HEAD public JSlider vSlider, hSlider; public Languages L; ======= public Settings S; >>>>>>> 815bbbcd422f7d26c23b9b9500ad569190f45e1c int STEPS = 10; public boolean pause = true, small = false; |
| Solution content |
|---|
public DataStructure D; // datovej struktury public Screen screen; // obrazovky v strede public ILabel statusBar; // a status baru public Settings S; int STEPS = 10; public boolean pause = true, small = false; |
| File |
|---|
| VisPanel.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |