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

Fix merge conflicts in DeletedContent.java

Browse Source
This commit is contained in:
Richard Cordovano 2017-08-11 12:59:04 -04:00
parent e4a39f498e
commit 2ec2c4a929
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
View File

@ -1,12 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
<<<<<<< HEAD
*
* Copyright 2013-2017 Basis Technology Corp.
=======
* *
* Copyright 2011-2017 Basis Technology Corp. * Copyright 2011-2017 Basis Technology Corp.
>>>>>>> upstream/rc-2.8.3
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -447,11 +442,6 @@ public class DeletedContent implements AutopsyVisitableItem {
} }
query += " LIMIT " + MAX_OBJECTS; //NON-NLS query += " LIMIT " + MAX_OBJECTS; //NON-NLS
<<<<<<< HEAD
=======
>>>>>>> upstream/rc-2.8.3
return query; return query;
} }