chore: fix merge conflicts

taskforcesh · Feb 22, 2024 · 3586bc7 · 3586bc7
1 parent 63c4dbb
commit 3586bc7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/python/bullmq/scripts.py b/python/bullmq/scripts.py
@@ -574,7 +574,7 @@ def finishedErrors(self, code: int, jobId: str, command: str, state: str) -> Typ
         elif code == ErrorCode.JobLockMismatch.value:
             return TypeError(f"Lock mismatch for job {jobId}. Cmd {command} from {state}")
         elif code == ErrorCode.ParentJobCannotBeReplaced.value:
-            return TypeError(f"The parent job of job {jobId} cannot be replaced. {command}")
+            return TypeError(f"The parent job {jobId} cannot be replaced. {command}")
         else:
             return TypeError(f"Unknown code {str(code)} error for {jobId}.{command}")