codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-21 01:57:31 +00:00
Code Issues Releases Wiki Activity

Repair merge errors

Browse Source
This commit is contained in:
Richard Cordovano
2017-02-08 20:26:51 -05:00
parent 32a457808a
commit 2d2c1db850
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
+1
View File
@@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.datamodel;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.logging.Level;
import org.apache.commons.lang.StringUtils;
import org.openide.util.NbBundle;
Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorIngestModuleFactory.java
+2
View File
@@ -18,8 +18,10 @@
*/
package org.sleuthkit.autopsy.test;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;