Projects >> netcracker-web >>26e795565705ab3f15cc8530ceba740d6a960929

Chunk
Conflicting content 
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import netcracker.dao.*;
<<<<<<< HEAD
import netcracker.service.Mail;
=======
import org.apache.commons.lang.StringUtils;
>>>>>>> 7d7f26e79f49b1f5ff43f58cd4d803b947e8efac
   // or import javax.faces.bean.SessionScoped;

@Named("Schedule")
Solution content 
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import netcracker.dao.*;
import netcracker.service.Mail;
import org.apache.commons.lang.StringUtils;

   // or import javax.faces.bean.SessionScoped;

@Named("Schedule")
File
Schedule.java
Developer's decision
Concatenation
Kind of conflict
Import