fix lint

gizatechxyz · Jan 22, 2024 · 5f24cc3 · 5f24cc3
1 parent 87bd063
commit 5f24cc3
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/osiris/app.py b/osiris/app.py
@@ -1,7 +1,11 @@
 import os
 
 import numpy as np
+<<<<<<< Updated upstream
 import polars as pl
+=======
+import pandas as pd
+>>>>>>> Stashed changes
 import typer
 
 from osiris.cairo.data_converter.data_converter import convert_to_cairo
@@ -13,7 +17,10 @@
 
 app = typer.Typer()
 
+<<<<<<< Updated upstream
 
+=======
+>>>>>>> Stashed changes
 def check_file_format(file_path):
     _, file_extension = os.path.splitext(file_path)