fix lint

dan/ocr/document/train.py

@@ -24,11 +24,8 @@ try:
 
     MLFLOW = True
     logger.info("MLflow Logging available.")
-<<<<<<< HEAD
+
     from dan.mlflow import make_mlflow_request, start_mlflow_run
-=======
-    from dan.mlflow import start_mlflow_run, make_mlflow_request
->>>>>>> e8dfc5f (last requests)
 except ImportError:
     MLFLOW = False
 
@@ -75,15 +72,9 @@ def get_config():
     """
     Retrieve model configuration
     """
-<<<<<<< HEAD
     dataset_name = "esposalles"
     dataset_level = "record"
     dataset_variant = "_debug"
-=======
-    dataset_name = "synist"
-    dataset_level = "manual_text_lines"
-    dataset_variant = ""
->>>>>>> e8dfc5f (last requests)
     dataset_path = "."
     params = {
         "mlflow": {
@@ -303,42 +294,25 @@ def run():
             / "labels.json"
         )
         with start_mlflow_run(config["mlflow"]) as run:
-            logger.info(f"Started MLflow run with ID ({run.info.run_id})")
-<<<<<<< HEAD
-
-            make_mlflow_request(
-                mlflow_method=mlflow.set_tags, tags={"Dataset": dataset_name}
-=======
-            
+            logger.info(f"Started MLflow run with ID ({run.info.run_id})")            
             make_mlflow_request(
                 mlflow_method=mlflow.set_tags,
                 tags={"Dataset": dataset_name}
->>>>>>> e8dfc5f (last requests)
             )
-
             # Get the labels json file
             with open(labels_path) as json_file:
                 labels_artifact = json.load(json_file)
 
             # Log MLflow artifacts
-<<<<<<< HEAD
             for artifact, filename in [
                 (config_artifact, "config.json"),
                 (labels_artifact, "labels.json"),
             ]:
-=======
-            for artifact, filename in [(config_artifact, "config.json"), (labels_artifact, "labels.json")]:
->>>>>>> e8dfc5f (last requests)
                 make_mlflow_request(
                     mlflow_method=mlflow.log_dict,
                     dictionary=artifact,
                     artifact_file=filename,
                 )
-<<<<<<< HEAD
-
-=======
-            
->>>>>>> e8dfc5f (last requests)
             if (
                 config["training_params"]["use_ddp"]
                 and not config["training_params"]["force_cpu"]