From 2456cddbacb6e46cbb175a474aad4043409fe751 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 5 Sep 2016 10:57:18 -0400
Subject: [PATCH] More merging

---
 .../experimental/configuration/AdvancedOptionsPanel.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java
index 9fd150bde1..f78cb56644 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java
@@ -135,7 +135,7 @@ class AdvancedOptionsPanel extends javax.swing.JPanel {
         lbSecondsBetweenJobs = new javax.swing.JLabel();
         spSecondsBetweenJobs = new javax.swing.JSpinner();
         lbNumberOfThreads = new javax.swing.JLabel();
-        numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox<>();
+        numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox<Integer>();
         lbRestartRequired = new javax.swing.JLabel();
         lbRetriesAllowed = new javax.swing.JLabel();
         spMainScrollPane = new javax.swing.JScrollPane();