Projects >> graylog2-server >>d713637601609418895647c2463d349834c172c4

Chunk
Conflicting content
        // Write to database.
        final String id = inputService.save(mongoInput);

<<<<<<< HEAD
        final URI radioUri = UriBuilder.fromResource(RadiosResource.class)
=======
        final Map result = ImmutableMap.of("persist_id", id);
        final URI radioUri = getUriBuilderToSelf().path(RadiosResource.class)
>>>>>>> 44a24871ed53fcb51ab5af8b80d39789a23df5df
                .path("{radioId}")
                .build(id);
Solution content
        // Write to database.
        final String id = inputService.save(mongoInput);

        final URI radioUri = getUriBuilderToSelf().path(RadiosResource.class)
                .path("{radioId}")
                .build(id);
File
RadiosResource.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable