| Chunk |
|---|
| Conflicting content |
|---|
import org.exoplatform.web.application.RequestContext; import org.gatein.common.text.EntityEncoder; <<<<<<< HEAD import javax.inject.Inject; import java.text.DateFormat; import java.util.*; import java.util.Calendar; import org.exoplatform.calendar.service.impl.NewUserListener; ======= >>>>>>> a7640d6c7150109f85f2f1f372085e0ffebfdec2 /** * @author Fbradai * @date 13/12/12 |
| Solution content |
|---|
import org.exoplatform.web.application.RequestContext; import org.gatein.common.text.EntityEncoder; /** * @author Fbradai * @date 13/12/12 |
| File |
|---|
| CalendarPortletController.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |