From b707b1359eb0c28a9b8984a4793152eeebd799d0 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Wed, 20 Jun 2018 13:40:11 -0400
Subject: [PATCH] Fix for merge conflict resolution issue.

---
 .../AutoIngestUserPreferences.java            | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
index 11b6bfe496..f7ebfddf5d 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
@@ -41,7 +41,6 @@ public final class AutoIngestUserPreferences {
     private static final String SHOW_TOOLS_WARNING = "ShowToolsWarning"; // NON-NLS
     private static final String MAX_NUM_TIMES_TO_PROCESS_IMAGE = "MaxNumTimesToAttemptToProcessImage"; // NON-NLS
     private static final int DEFAULT_MAX_TIMES_TO_PROCESS_IMAGE = 0;
-    private static final String MAX_CONCURRENT_NODES_FOR_ONE_CASE = "MaxConcurrentNodesForOneCase"; // NON-NLS
     private static final String STATUS_DATABASE_LOGGING_ENABLED = "StatusDatabaseLoggingEnabled"; // NON-NLS
     private static final String LOGGING_DB_HOSTNAME_OR_IP = "LoggingHostnameOrIP"; // NON-NLS
     private static final String LOGGING_PORT = "LoggingPort"; // NON-NLS
@@ -258,27 +257,6 @@ public final class AutoIngestUserPreferences {
         ModuleSettings.setConfigSetting(UserPreferences.SETTINGS_PROPERTIES, MAX_NUM_TIMES_TO_PROCESS_IMAGE, Integer.toString(retries));
     }
 
-    /**
-     * Get maximum number of concurrent ingest nodes allowable for one case at a
-     * time.
-     *
-     * @return maximum number of concurrent nodes for one case. Default is 3.
-     */
-    public static int getMaxConcurrentJobsForOneCase() {
-        String value = getPreferenceValue(MAX_CONCURRENT_NODES_FOR_ONE_CASE);
-        return value.isEmpty() ? 3 : Integer.parseInt(value);
-    }
-
-    /**
-     * Get maximum number of concurrent ingest nodes allowable for one case at a
-     * time.
-     *
-     * @param numberOfNodes the number of concurrent nodes to allow for one case
-     */
-    public static void setMaxConcurrentIngestNodesForOneCase(int numberOfNodes) {
-        ModuleSettings.setConfigSetting(UserPreferences.SETTINGS_PROPERTIES, MAX_CONCURRENT_NODES_FOR_ONE_CASE, Integer.toString(numberOfNodes));
-    }
-
     /**
      * Get status database logging checkbox state for automated ingest mode from
      * persistent storage.