More merging

This commit is contained in:
Eugene Livis 2016-09-05 10:57:18 -04:00
parent 1d11971c81
commit 2456cddbac

View File

@ -135,7 +135,7 @@ class AdvancedOptionsPanel extends javax.swing.JPanel {
lbSecondsBetweenJobs = new javax.swing.JLabel(); lbSecondsBetweenJobs = new javax.swing.JLabel();
spSecondsBetweenJobs = new javax.swing.JSpinner(); spSecondsBetweenJobs = new javax.swing.JSpinner();
lbNumberOfThreads = new javax.swing.JLabel(); lbNumberOfThreads = new javax.swing.JLabel();
numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox<>(); numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox<Integer>();
lbRestartRequired = new javax.swing.JLabel(); lbRestartRequired = new javax.swing.JLabel();
lbRetriesAllowed = new javax.swing.JLabel(); lbRetriesAllowed = new javax.swing.JLabel();
spMainScrollPane = new javax.swing.JScrollPane(); spMainScrollPane = new javax.swing.JScrollPane();