Skip to content
Snippets Groups Projects
Commit e614af56 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

fixed GAUDI-1113: name 'locker' is not defined in merge_files.py 

Re-added 'import locker' (where needed) to merge_files.py (removed by commit 13de2d61).

See merge request !54
parents bf01805b bddb7417
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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