resolve merge conflicts and linting errors from recent merge

OpenAdaptAI · Aug 18, 2023 · 0e8d620 · 0e8d620
1 parent 1b2eef3
commit 0e8d620
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 13 deletions.
diff --git a/openadapt/privacy/__init__.py b/openadapt/privacy/__init__.py
@@ -0,0 +1,4 @@
+"""Package for the Privacy API.
+
+Module: __init__.py
+"""
diff --git a/openadapt/privacy/providers/__init__.py b/openadapt/privacy/providers/__init__.py
@@ -0,0 +1,4 @@
+"""Package for the Privacy API Providers.
+
+Module: __init__.py
+"""
diff --git a/openadapt/visualize.py b/openadapt/visualize.py
@@ -16,7 +16,6 @@
 from openadapt import config, crud
 from openadapt.crud import get_latest_recording
 from openadapt.events import get_events
-from openadapt.models import Recording
 from openadapt.privacy.providers.presidio import PresidioScrubbingProvider
 from openadapt.utils import (
     EMPTY,

diff --git a/poetry.lock b/poetry.lock