fix merge conflicts

uwblueprint · Jan 1, 2024 · 68dd6ef · 68dd6ef
2 parents 224e81d + e942177
commit 68dd6ef
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/backend/app/rest/residents_routes.py b/backend/app/rest/residents_routes.py
@@ -132,6 +132,10 @@ def get_residents():
         page_number = int(request.args.get("page_number"))
     except:
         pass
+    try:
+        filters = json.loads(request.args.get("filters"))
+    except:
+        filters = None
 
     filters = None
     try: