mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resovle conflicts

Browse Source
This commit is contained in:
Joe Ho 2019-06-14 14:32:39 -04:00
commit 5078652f70
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED
View File

@ -1,4 +1,4 @@
/*= /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2013-15 Basis Technology Corp. * Copyright 2013-15 Basis Technology Corp.