| Chunk |
|---|
| Conflicting content |
|---|
// // // attach that panel over drag zone. Or to some other panel. But have on mind that dragging frame is visible over a drag zone. // dragZone.add(teamPanel, 10, 10); <<<<<<< HEAD // dragZone.addDropZoneContainer(teamPanel); // register teamPanel that have drop zones attached to him. ======= // dragZone.addDropZoneRoot(teamPanel); // register teamPanel that have drop zones attached to him. >>>>>>> 281f7e898e778b4ef908c6a0b293cd400ec4615a // // // make cars draggable // dragZone.add(car1, car2, car3); |
| Solution content |
|---|
// // // attach that panel over drag zone. Or to some other panel. But have on mind that dragging frame is visible over a drag zone. // dragZone.add(teamPanel, 10, 10); // dragZone.addDropZoneContainer(teamPanel); // register teamPanel that have drop zones attached to him. // // // make cars draggable // dragZone.add(car1, car2, car3); |
| File |
|---|
| DragNDrop.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
// race.go(racePanel);
//
// dragZone.add(racePanel, 360, 10);
<<<<<<< HEAD
// dragZone.addDropZoneContainer(racePanel);
=======
// dragZone.addDropZoneRoot(racePanel);
>>>>>>> 281f7e898e778b4ef908c6a0b293cd400ec4615a
// dragZone.setFrameStyle("dragFrame");
//
// dragZone.go(RootPanel.get()); // attach drag zone to the root panel or another panel. |
| Solution content |
|---|
// race.go(racePanel);
//
// dragZone.add(racePanel, 360, 10);
// dragZone.addDropZoneContainer(racePanel);
// dragZone.setFrameStyle("dragFrame");
//
// dragZone.go(RootPanel.get()); // attach drag zone to the root panel or another panel. |
| File |
|---|
| DragNDrop.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |