Skip to content
Snippets Groups Projects
Commit be1f0db2 authored by Robert Rosca's avatar Robert Rosca
Browse files

Merge branch 'roscar-master-patch-13225' into 'master'

MR for Hotfix in 3.4.2 Release

See merge request detectors/pycalibration!582
parents c3f82633 6b93b719
No related branches found
No related tags found
1 merge request!582MR for Hotfix in 3.4.2 Release
...@@ -14,7 +14,11 @@ from jinja2 import Template ...@@ -14,7 +14,11 @@ from jinja2 import Template
from xfel_calibrate.settings import free_nodes_cmd, preempt_nodes_cmd, reservation # noqa: E501 from xfel_calibrate.settings import free_nodes_cmd, preempt_nodes_cmd, reservation # noqa: E501
from .config import serve_overview as config try:
from .config import serve_overview as config
except:
from config import serve_overview as config
class LimitedSizeDict(OrderedDict): class LimitedSizeDict(OrderedDict):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment