From 2ee5a0ca61973735b4beea688fa61a049fad687a Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Mon, 6 Jan 2025 13:40:32 -0700 Subject: [PATCH] resolved merge conflict --- pyproject.toml | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ce37b770..7fee958a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -145,3 +145,4 @@ exclude = ''' )/ ''' + diff --git a/requirements.txt b/requirements.txt index 20a985b6..8d021128 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,4 +27,4 @@ aiofiles clusterops reportlab doc-master -pathos \ No newline at end of file +pathos