Projects >> social >>7a189d6722ddaa21643a5d631291d20a48401a54

Chunk
Conflicting content 
import java.util.LinkedHashMap;
import java.util.Map;

<<<<<<< HEAD
=======
import org.apache.commons.lang.StringEscapeUtils;
>>>>>>> b45ba7c0b9ce7d311a890077d88504d15ddd1dfb
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.services.log.ExoLogger;
Solution content 
import java.util.LinkedHashMap;
import java.util.Map;

import org.apache.commons.lang.StringEscapeUtils;
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.services.log.ExoLogger;
File
SpaceActivityPublisher.java
Developer's decision
Version 2
Kind of conflict
Import