Skip to content
Snippets Groups Projects
Commit 80989c5a authored by Greg DiCristofaro's avatar Greg DiCristofaro
Browse files

bundle update

parent fce1bd5a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -63,9 +63,15 @@ 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment