Projects >> tatami >>11ce545e9db0d328cce592a690113074652c17f2

Chunk
Conflicting content 
    @Bean
    public ViewResolver ContentNegotiatingViewResolver() {
        ContentNegotiatingViewResolver viewResolver = new ContentNegotiatingViewResolver();
<<<<<<< HEAD

        Map mediaTypes = new HashMap();
        mediaTypes.put("html", "text/html");
        mediaTypes.put("json", "application/json");
        mediaTypes.put("rss", "application/rss+xml");
        viewResolver.setMediaTypes(mediaTypes);

=======
>>>>>>> 2ec2c3b2f6f36f8639adcd953e0d51153f8cf8b1
        List viewResolvers = new ArrayList();

        UrlBasedViewResolver urlBasedViewResolver = new UrlBasedViewResolver();
Solution content 
    @Bean
    public ViewResolver ContentNegotiatingViewResolver() {
        ContentNegotiatingViewResolver viewResolver = new ContentNegotiatingViewResolver();
        List viewResolvers = new ArrayList();

        UrlBasedViewResolver urlBasedViewResolver = new UrlBasedViewResolver();
File
DispatcherServletConfig.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        viewResolver.setViewResolvers(viewResolvers);

        List defaultViews = new ArrayList();
<<<<<<< HEAD
        defaultViews.add(new MappingJacksonJsonView());
        defaultViews.add(syndicView());
=======
        defaultViews.add(new MappingJackson2JsonView());
>>>>>>> 2ec2c3b2f6f36f8639adcd953e0d51153f8cf8b1
        viewResolver.setDefaultViews(defaultViews);

        return viewResolver;
Solution content 
        viewResolver.setViewResolvers(viewResolvers);

        List defaultViews = new ArrayList();
        defaultViews.add(new MappingJackson2JsonView());
        defaultViews.add(syndicView());
        viewResolver.setDefaultViews(defaultViews);

        return viewResolver;
File
DispatcherServletConfig.java
Developer's decision
Combination
Kind of conflict
Method invocation