Commit 29a7a3ba authored by Arnaud Pauget's avatar Arnaud Pauget
Browse files

fix() : test prevent merge conflicts 3

parent de9dca42
Pipeline #14657 canceled with stages
......@@ -19,7 +19,7 @@
<?hinclude recordsManagement/archive/archiveModificationModal/retentionRule.html?>
<?hinclude recordsManagement/archive/archiveModificationModal/requestCommunication.html?>
<?hinclude recordsManagement/archive/archiveModificationModal/archiveTransfer.html?>
<!-- <?hinclude recordsManagement/archive/archiveModificationModal/originatorOrg.html?> -->
<?hinclude recordsManagement/archive/archiveModificationModal/originatorOrg.html?>
</div>
</div>
</div>
......
......@@ -95,8 +95,8 @@
requestModification : '/modificationRequest',
cancelDestruction : '/recordsManagement/cancelDestruction',
freeze : '/recordsManagement/archive/freeze',
unfreeze : '/recordsManagement/archive/unfreeze'
/* originatorOrg : '/recordsManagement/archive/originatorOrg' */
unfreeze : '/recordsManagement/archive/unfreeze',
editOriginator : '/recordsManagement/archive/originator',
},
actionsType : {},
modal : $('#modificationModal'),
......
Supports Markdown
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