| Chunk |
|---|
| Conflicting content |
|---|
import com.rapleaf.hank.coordinator.DomainConfig;
import com.rapleaf.hank.coordinator.DomainGroupConfig;
import com.rapleaf.hank.coordinator.DomainGroupConfigVersion;
<<<<<<< HEAD
import com.rapleaf.hank.exception.DataNotFoundException;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
public class DomainGroupController extends Controller {
=======
>>>>>>> b72df8fd634ab144f72440a3efb91cdc958f18a2
private final Coordinator coordinator;
|
| Solution content |
|---|
import com.rapleaf.hank.coordinator.DomainConfig;
import com.rapleaf.hank.coordinator.DomainGroupConfig;
import com.rapleaf.hank.coordinator.DomainGroupConfigVersion;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
public class DomainGroupController extends Controller {
private final Coordinator coordinator;
|
| File |
|---|
| DomainGroupController.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Class signature |
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.rapleaf.hank.coordinator.Coordinator;
import com.rapleaf.hank.coordinator.PartDaemonAddress;
<<<<<<< HEAD
import com.rapleaf.hank.exception.DataNotFoundException;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
=======
>>>>>>> b72df8fd634ab144f72440a3efb91cdc958f18a2
public class RingController extends Controller {
|
| Solution content |
|---|
import com.rapleaf.hank.coordinator.Coordinator;
import com.rapleaf.hank.coordinator.PartDaemonAddress;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
public class RingController extends Controller {
|
| File |
|---|
| RingController.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.rapleaf.hank.coordinator.Coordinator;
import com.rapleaf.hank.coordinator.RingGroupConfig;
<<<<<<< HEAD
import com.rapleaf.hank.exception.DataNotFoundException;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
=======
>>>>>>> b72df8fd634ab144f72440a3efb91cdc958f18a2
public class RingGroupController extends Controller {
|
| Solution content |
|---|
import com.rapleaf.hank.coordinator.Coordinator;
import com.rapleaf.hank.coordinator.RingGroupConfig;
import com.rapleaf.hank.ui.controller.Action;
import com.rapleaf.hank.ui.controller.Controller;
public class RingGroupController extends Controller {
|
| File |
|---|
| RingGroupController.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |