From 2ec2c4a92972d1a033d7f48a6f10a4d36420b194 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 11 Aug 2017 12:59:04 -0400
Subject: [PATCH] Fix merge conflicts in DeletedContent.java
---
.../sleuthkit/autopsy/datamodel/DeletedContent.java | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
index 2892141066..71f0bb4a8e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
@@ -1,12 +1,7 @@
/*
* Autopsy Forensic Browser
-<<<<<<< HEAD
- *
- * Copyright 2013-2017 Basis Technology Corp.
-=======
*
* Copyright 2011-2017 Basis Technology Corp.
->>>>>>> upstream/rc-2.8.3
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -447,11 +442,6 @@ static private String makeQuery(DeletedContent.DeletedContentFilter filter) {
}
query += " LIMIT " + MAX_OBJECTS; //NON-NLS
-<<<<<<< HEAD
-
-=======
-
->>>>>>> upstream/rc-2.8.3
return query;
}
--
GitLab