From d0daecdb7f6eaf4daa0d689434c4c2f2ca2ba1b8 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 26 Jan 2022 08:21:33 +0100 Subject: [PATCH] fix import after merge --- app/but/bulletin_but.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py index 95e18156..c81f3678 100644 --- a/app/but/bulletin_but.py +++ b/app/but/bulletin_but.py @@ -11,11 +11,6 @@ import datetime from flask import url_for, g from app.scodoc import sco_utils as scu -<<<<<<< HEAD -======= -from app.scodoc.sco_cache import ResultatsSemestreBUTCache -from app.scodoc import sco_abs ->>>>>>> 4c5c20ce7e4ef3d86c704c1e8225d3146eaccb29 from app.scodoc import sco_bulletins_json from app.scodoc import sco_preferences from app.scodoc.sco_codes_parcours import UE_SPORT