pascal.bouron/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

fix import after merge

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-01-26 08:21:33 +01:00
parent 1488823c5d
commit d0daecdb7f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/but/bulletin_but.py
View File

@ -11,11 +11,6 @@ import datetime
from flask import url_for, g from flask import url_for, g
from app.scodoc import sco_utils as scu 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_bulletins_json
from app.scodoc import sco_preferences from app.scodoc import sco_preferences
from app.scodoc.sco_codes_parcours import UE_SPORT from app.scodoc.sco_codes_parcours import UE_SPORT