Projects >> liferay-faces >>8790c7ba9b200470358b071d0da3fee6b39bc068

Chunk
Conflicting content 
		// Initialize the portlet container implementation.
		PortletContainerFactory portletContainerFactory = (PortletContainerFactory) BridgeFactoryFinder.getFactory(
				PortletContainerFactory.class);
<<<<<<< HEAD
		this.portletContainer = portletContainerFactory.getPortletContainer(portletConfig, portletContext,
				portletRequest, portletResponse, portletPhase);
=======
		this.portletContainer = portletContainerFactory.getPortletContainer(portletContext, portletRequest,
				portletResponse, portletPhase);
>>>>>>> 59a3ba12abe3e8f2f62aa0cd1b7b1db407197185
	}

	public void dispatch(String path) throws IOException {
Solution content 
	}

		// Initialize the portlet container implementation.
		PortletContainerFactory portletContainerFactory = (PortletContainerFactory) BridgeFactoryFinder.getFactory(
				PortletContainerFactory.class);
		this.portletContainer = portletContainerFactory.getPortletContainer(portletConfig, portletContext,
				portletRequest, portletResponse, portletPhase);
	public void dispatch(String path) throws IOException {
File
BridgeContextImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation