Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 3c87d5f1 authored by Izidorf's avatar Izidorf
Browse files

merge conflict

parent d0aace27
...@@ -198,15 +198,12 @@ INSTALLED_APPS_WORKFLOWS_SUB = ( ...@@ -198,15 +198,12 @@ INSTALLED_APPS_WORKFLOWS_SUB = (
'workflows.cforange', 'workflows.cforange',
'workflows.perfeval', 'workflows.perfeval',
'workflows.mysql', 'workflows.mysql',
<<<<<<< HEAD
'workflows.lemmagen', 'workflows.lemmagen',
'workflows.crossbee', 'workflows.crossbee',
'workflows.scikitAlgorithms', 'workflows.scikitAlgorithms',
=======
#'workflows.lemmagen', #'workflows.lemmagen',
#'workflows.crossbee', #'workflows.crossbee',
'workflows.streaming', 'workflows.streaming',
>>>>>>> 3d4c5605eb0cc9b6e49e1daeb50a05f2accc9d75
#WORKFLOWS_SUBAPP_PLACEHOLDER #WORKFLOWS_SUBAPP_PLACEHOLDER
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment