From 19b30212e7e0df43f05c20cec66e7a7ec962f942 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Thu, 3 Dec 2020 13:53:20 -0500
Subject: [PATCH] bundle cleanup
---
.../src/org/sleuthkit/datamodel/Bundle.properties-MERGED | 6 ------
1 file changed, 6 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index ef0cdf511..598628014 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -63,15 +63,9 @@ BlackboardArtifact.tskDeletedProg.text=Deleted Programs
BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
BlackboardArtifact.shortDescriptionDate.text=at {0}
BlackboardArtifact.tskAssociatedObject.text=Associated Object
-<<<<<<< HEAD
BlackboardArtifact.tskDomainCategoryType.text=Domain Category
-=======
-<<<<<<< HEAD
BlackboardArtifact.tskYaraHit.text=YARA Hit
-=======
BlackboardArtifact.tskGPSArea.text=GPS Area
->>>>>>> develop
->>>>>>> 5f597b6330f3b1e371ec175c3ba4594768a2b8d1
BlackboardAttribute.tskAccountType.text=Account Type
BlackboardAttribute.tskUrl.text=URL
BlackboardAttribute.tskDatetime.text=Date/Time
--
GitLab