Projects information

Chunk

Conflicting content
.put("preview", PreviewNetworksModule.class) .put("itvinterlinking", ItvInterlinkingModule.class) .put("worldservice", WorldServicesModule.class) <<<<<<< HEAD .put("lakeview", LakeviewModule.class) ======= >>>>>>> c3a6831d6ff97508761156bbc27a10360fcb8e46 .put("redux", ReduxModule.class) .build();

Conflicting content

        .put("preview", PreviewNetworksModule.class)
        .put("itvinterlinking", ItvInterlinkingModule.class)
        .put("worldservice", WorldServicesModule.class)
<<<<<<< HEAD
        .put("lakeview", LakeviewModule.class)
=======
>>>>>>> c3a6831d6ff97508761156bbc27a10360fcb8e46
        .put("redux", ReduxModule.class)
    .build();

Solution content
.put("preview", PreviewNetworksModule.class) .put("itvinterlinking", ItvInterlinkingModule.class) .put("worldservice", WorldServicesModule.class) .put("lakeview", LakeviewModule.class) .put("redux", ReduxModule.class) .build();

Solution content

        .put("preview", PreviewNetworksModule.class)
        .put("itvinterlinking", ItvInterlinkingModule.class)
        .put("worldservice", WorldServicesModule.class)
        .put("lakeview", LakeviewModule.class)
        .put("redux", ReduxModule.class)
    .build();

File
RemoteSiteModuleConfigurer.java

Developer's decision
Version 1

Kind of conflict
Other

Projects >> atlas >>f63b03b6faf449e0ab2f37923d1bc13ad115b262