Projects >> deepamehta >>13402e44c98b885e450f0eada839e0efcf18da1b

Chunk
Conflicting content
=======
            //
            logger.info("----- Activating " + this + " -----");
            installPluginInDB();        // relies on DeepaMehtaService
<<<<<<< HEAD
            registerListeners();        // relies on DeepaMehtaService
            initializePlugin();         // ### merge notice: must perform *before* registerListeners()
>>>>>>> 435f42854eeb2eeef85241d1b6d4c08edeaf2f9b
            registerPlugin();           // relies on DeepaMehtaService (and committed migrations)
            logger.info("----- Activation of " + this + " complete -----");
            return true;
Solution content
            //
            logger.info("----- Activating " + this + " -----");
            installPluginInDB();        // relies on DeepaMehtaService
            initializePlugin();         // relies on DeepaMehtaService
            registerListeners();        // relies on DeepaMehtaService
            registerPlugin();           // relies on DeepaMehtaService (and committed migrations)
            logger.info("----- Activation of " + this + " complete -----");
            return true;
File
PluginImpl.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation