From 812aa52265a422bcd56f28cd44dc27e626d93dc7 Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Fri, 10 Feb 2023 11:50:05 +0100
Subject: [PATCH] fix lint

---
 dan/manager/training.py | 2 ++
 dan/utils.py            | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dan/manager/training.py b/dan/manager/training.py
index 921f1c8a..a1c3b1e4 100644
--- a/dan/manager/training.py
+++ b/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
diff --git a/dan/utils.py b/dan/utils.py
index e11c2e85..50f7311d 100644
--- a/dan/utils.py
+++ b/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
-- 
GitLab