Projects >> play2-elasticsearch >>327e6805cf59e01458630988b990d4074955defb

Chunk
Conflicting content 
        this.showRequest = app.configuration().getBoolean("elasticsearch.index.show_request", false);

<<<<<<< HEAD
        Boolean dropOnShutdown = app.configuration().getBoolean("elasticsearch.index.dropOnShutdown");
        if (dropOnShutdown != null) {
            this.dropOnShutdown = dropOnShutdown;
        }
=======
        this.dropOnShutdown = app.configuration().getBoolean("elasticsearch.index.dropOnShutdown", false);
>>>>>>> f2371fabe3231cad66c929d4571b9433697f2eaa

        loadMappingFromAnnotations();
        loadMappingFromConfig();
Solution content 
        this.showRequest = app.configuration().getBoolean("elasticsearch.index.show_request", false);

        this.dropOnShutdown = app.configuration().getBoolean("elasticsearch.index.dropOnShutdown", false);

        loadMappingFromAnnotations();
        loadMappingFromConfig();
File
IndexConfig.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Variable