resolve merge conflict
Showing
- src/LHCbDIRAC/ConfigurationSystem/Client/Helpers/Resources.py 17 additions, 26 deletions...LHCbDIRAC/ConfigurationSystem/Client/Helpers/Resources.py
- src/LHCbDIRAC/ConfigurationSystem/Client/Helpers/test/Test_Helpers.py 3 additions, 31 deletions...C/ConfigurationSystem/Client/Helpers/test/Test_Helpers.py
Loading
Please register or sign in to comment