Changes to (hopefully) FINALLY integrate StrongSORT

CornellDataScience · Sep 2, 2023 · 97dcbaf · 97dcbaf
1 parent 9ba6f1e
commit 97dcbaf
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/view/app.py b/view/app.py
@@ -1,10 +1,7 @@
 """
 Frontend
 """
-<<<<<<< HEAD
-=======
-
->>>>>>> ad2262d (Remove credentials)
+from src import main
 import io
 import sys
 import os
@@ -13,11 +10,7 @@
 import pandas as pd
 import requests
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-from src import main
-<<<<<<< HEAD
 
-=======
->>>>>>> ad2262d (Remove credentials)
 # Set up tab title and favicon
 st.set_page_config(page_title='HoopTracker', page_icon=':basketball:')