ManagedDataLineIngestBoss.java

public class ManagedDataLineIngestBoss extends BaseBoss<ManagedDataLine> {
    public static ManagedDataLineIngestBoss INSTANCE;

<<<<<<< HEAD
    private static final Logger LOG = Logger.getLogger(ManagedDataLineIngestBoss.class);

    @Autowired(required = true) private ManagedDataLineDao dataLineDao;
    @Autowired(required = true) private IngestTimelineEntryDao timelineEntryDao;
    @Autowired(required = true) private IngestionService ingestionService;
    @Autowired(required = true) private AdministrativeNotifier notifier;
    @Value("${autostart.dataline_ingest.boss:true}") private boolean autostart;

    @Override
    protected Logger log() {
        return LOG;
    }   
=======
    @Autowired private ManagedDataLineDao dataLineDao;
    @Autowired private IngestTimelineEntryDao timelineEntryDao;
    @Autowired private IngestionService ingestionService;
    @Autowired private AdministrativeNotifier notifier;
    @Value("${autostart.dataline_ingest.boss:true}") private boolean autostart;
>>>>>>> RB_3.6