mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 02:07:42 +00:00

# Conflicts: # KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED # RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED # branding/core/core.jar/org/netbeans/core/startup/Bundle.properties # branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties