Projects >> core >>678b3edf24e69c37f40f3dab45680e5ecb91774f

Chunk
Conflicting content
		APILocator.getContentletIndexAPI().createContentIndex(indexName, shards);

	}
<<<<<<< HEAD
	
	public void clearIndex(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, DotStateException, DotDataException {
=======

	public void clearIndex(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
>>>>>>> 6682bb0138d493f30aaf52872d9fe1891ef5184f
		Map map = getURIParams();
		String indexName = map.get("indexName");
		if(indexName == null)return;
Solution content
		APILocator.getContentletIndexAPI().createContentIndex(indexName, shards);

	}
	
	public void clearIndex(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, DotStateException, DotDataException {
		Map map = getURIParams();
		String indexName = map.get("indexName");
		if(indexName == null)return;
File
IndexAjaxAction.java
Developer's decision
Version 1
Kind of conflict
Method signature