fix lint

dan/manager/training.py

@@ -23,8 +23,10 @@ from tqdm import tqdm
 from dan.manager.metrics import MetricManager
 from dan.ocr.utils import LM_ind_to_str
 from dan.schedulers import DropoutScheduler
+
 try:
     import mlflow
+
     from dan.mlflow import logging_metrics, logging_tags_metrics
 except ImportError:
     pass

dan/utils.py

@@ -23,10 +23,7 @@ class MLflowNotInstalled(Exception):
     Raised when MLflow logging was requested but the module was not installed
     """
 
-<<<<<<< HEAD
 
-=======
->>>>>>> bf9cf44 (check if mlflow is available at runtime)
 def randint(low, high):
     """
     call torch.randint to preserve random among dataloader workers