From 7ae1bba42c8601c1ae712471bb1e0940891dff1c Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 24 Sep 2019 10:10:06 -0400
Subject: [PATCH] Updated the merge file.

---
 .../sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
index 6c63fcb0cf..07655ceb1b 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
@@ -36,7 +36,7 @@ SaveSnapShotAsReport.reportName.prompt=leave empty for default report name: {0}.
 # {0} - report file path
 SaveSnapShotAsReport.ReportSavedAt=Report saved at [{0}]
 SaveSnapShotAsReport.Success=Success
-SaveSnapShotAsReport_Path_Failure_Report=Failed to create report.  Invalid path: {0}
+SaveSnapShotAsReport_Path_Failure_Report=Failed to create report. Supplied report name has invalid characters: {0}
 SaveSnapShotAsReport_Report_Failed=Report failed
 Timeline.ModuleName=Timeline
 ViewArtifactInTimelineAction.displayName=View Result in Timeline...