bundle cleanup

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