From 6f7c800c96d4255cc0ff7af972019852a1b6698f Mon Sep 17 00:00:00 2001
From: Enkidu93 <lowryec17@gcc.edu>
Date: Tue, 10 Oct 2023 14:39:26 -0400
Subject: [PATCH] Fix merge error

---
 src/Serval.DataFiles/Controllers/DataFilesController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Serval.DataFiles/Controllers/DataFilesController.cs b/src/Serval.DataFiles/Controllers/DataFilesController.cs
index 905393ff..b1e938ae 100644
--- a/src/Serval.DataFiles/Controllers/DataFilesController.cs
+++ b/src/Serval.DataFiles/Controllers/DataFilesController.cs
@@ -95,8 +95,9 @@ public async Task<ActionResult<DataFileDto>> GetAsync([NotNull] string id, Cance
     ///     > verse_001_006 (tab) Ἀγγέλους τε τοὺς μὴ τηρήσαντας τὴν ἑαυτῶν ἀρχήν , ἀλλὰ (tab) ss
     ///     > verse_001_007 (tab) Ὡς Σόδομα καὶ Γόμορρα , καὶ αἱ περὶ αὐτὰς πόλεις (tab) ss
     ///   * Otherwise, *no tabs* should be used in the file and a unique identifier will generated for each translation unit based on the line number.
-    /// * **Paratext**: A complete, zipped Paratext project
-    /// </param>    /// <param name="idGenerator"></param>
+    /// * **Paratext**: A complete, zipped Paratext project backup: that is, a .zip archive of files including the USFM files and "Settings.xml" file. To generate a zipped backup for a project in Paratext, navigate to "Paratext/Advanced/Backup project to file..." and follow the dialogue.
+    /// </param>
+    /// <param name="idGenerator"></param>
     /// <param name="cancellationToken"></param>
     /// <response code="201">The file was created successfully</response>
     /// <response code="400">Bad request. Is the file over 100 MB?</response>