Projects >> gradle >>f761920fe743d45736b39cf395fd0dbbf57b0fa0

Chunk
Conflicting content
        return new DefaultToolingModelBuilderRegistry();
    }

<<<<<<< HEAD
    protected PluginManagerInternal createPluginManager() {
        PluginApplicator applicator = new RuleBasedPluginApplicator(project, get(ModelRuleExtractor.class), get(ModelRuleSourceDetector.class));
        return new DefaultPluginManager(get(PluginRegistry.class), new DependencyInjectingInstantiator(this), applicator);
=======
    protected PluginManagerInternal createPluginManager(Instantiator instantiator) {
        List handlers = getAll(MethodRuleDefinitionHandler.class);
        List coreHandlers = MethodRuleDefinitionHandlers.coreHandlers(
                instantiator,
                get(ModelSchemaStore.class)
        );
        ModelRuleInspector inspector = new ModelRuleInspector(Iterables.concat(coreHandlers, handlers));
        PluginApplicator applicator = new RulesCapablePluginApplicator(project, inspector, get(ModelRuleSourceDetector.class));
        return instantiator.newInstance(DefaultPluginManager.class, get(PluginRegistry.class), new DependencyInjectingInstantiator(this), applicator);
>>>>>>> 3431df61a9542f832c09c21774379d31edd26cdc
    }

    protected ITaskFactory createTaskFactory(ITaskFactory parentFactory) {
Solution content
        return new DefaultToolingModelBuilderRegistry();
    }

    protected PluginManagerInternal createPluginManager(Instantiator instantiator) {
        PluginApplicator applicator = new RuleBasedPluginApplicator(project, get(ModelRuleExtractor.class), get(ModelRuleSourceDetector.class));
        return instantiator.newInstance(DefaultPluginManager.class, get(PluginRegistry.class), new DependencyInjectingInstantiator(this), applicator);
    }

    protected ITaskFactory createTaskFactory(ITaskFactory parentFactory) {
File
ProjectScopeServices.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature
Return statement
Variable