From 30013b3be6030c395f4fc4417c396001ce72f9b7 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@gmail.com>
Date: Fri, 20 Sep 2024 22:19:41 -0400
Subject: [PATCH] Add types for psycogp2

---
 docassemble/AssemblyLine/requirements.txt | 3 ++-
 docassemble/AssemblyLine/sessions.py      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docassemble/AssemblyLine/requirements.txt b/docassemble/AssemblyLine/requirements.txt
index f0639911..50ac54ef 100644
--- a/docassemble/AssemblyLine/requirements.txt
+++ b/docassemble/AssemblyLine/requirements.txt
@@ -5,4 +5,5 @@ pandas-stubs
 sqlalchemy[mypy]
 types-PyYAML
 PyGithub
-types-requests
\ No newline at end of file
+types-requests
+types-psycopg2
\ No newline at end of file
diff --git a/docassemble/AssemblyLine/sessions.py b/docassemble/AssemblyLine/sessions.py
index a56de84f..ebe96a87 100644
--- a/docassemble/AssemblyLine/sessions.py
+++ b/docassemble/AssemblyLine/sessions.py
@@ -1593,7 +1593,11 @@ def config_with_language_fallback(
 def get_filenames_having_sessions(
     user_id: Optional[Union[int, str]] = None,
     global_search_allowed_roles: Optional[Union[Set[str], List[str]]] = None,
+<<<<<<< Updated upstream
 ) -> List[str]:
+=======
+):
+>>>>>>> Stashed changes
     """Get a list of all filenames that have sessions saved for a given user, in order
     to help show the user a good list of interviews to filter search results.