fix lint

gizatechxyz · Jan 21, 2024 · 9fdad7f · 9fdad7f
1 parent c349665
commit 9fdad7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/osiris/app.py b/osiris/app.py
@@ -1,4 +1,3 @@
-import json
 import os
 
 import numpy as np

diff --git a/osiris/cairo/serde/deserialize.py b/osiris/cairo/serde/deserialize.py
@@ -1,3 +1,8 @@
+<<<<<<< Updated upstream
+=======
+import json
+
+>>>>>>> Stashed changes
 import numpy as np
 
 from .utils import from_fp