Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Autopsy
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f5d65a4d

Commit f5d65a4d authored 1 year ago by Mark McKinnon

Downloads
- Patches
- Plain Diff

FIx Merge Issues

Fix Merge Issues

parent 4a12500a

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/Bundle.properties 7 additions, 0 deletions

...tech/df/cybertriage/autopsy/malwarescan/Bundle.properties
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/Bundle.properties-MERGED 8 additions, 1 deletion

.../cybertriage/autopsy/malwarescan/Bundle.properties-MERGED
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java 15 additions, 13 deletions

...ertriage/autopsy/malwarescan/MalwareScanIngestModule.java
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModuleFactory.java 23 additions, 2 deletions

...e/autopsy/malwarescan/MalwareScanIngestModuleFactory.java
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestSettings.java 96 additions, 0 deletions

...triage/autopsy/malwarescan/MalwareScanIngestSettings.java
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestSettingsPanel.form 123 additions, 0 deletions

...e/autopsy/malwarescan/MalwareScanIngestSettingsPanel.form
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestSettingsPanel.java 149 additions, 0 deletions

...e/autopsy/malwarescan/MalwareScanIngestSettingsPanel.java

with 421 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment